From efc5f2246391dc536e5ace471af019bba8d6851b Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 2 Sep 1999 05:31:38 +0000
Subject: [PATCH] Prep for wxPython 2.1b3 release

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3550 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 utils/wxPython/.cvsignore                     |    2 +
 utils/wxPython/README.txt                     |   34 +-
 utils/wxPython/demo/Main.py                   |   13 +-
 utils/wxPython/demo/htmlview.py               |   77 +
 utils/wxPython/demo/htmlwidget.py             |   97 +
 utils/wxPython/demo/wxDialog.py               |    2 +-
 utils/wxPython/demo/wxTimer.py                |    2 +-
 utils/wxPython/distrib/build.py               |   24 +-
 utils/wxPython/distrib/wxPython.rsp           |   70 +-
 utils/wxPython/distrib/wxPython.wse           |    6 +-
 utils/wxPython/distrib/wxPython.wsm           |  Bin 4 -> 33 bytes
 utils/wxPython/modules/glcanvas/build.cfg     |    4 +-
 .../modules/glcanvas/msw/glcanvas.cpp         | 2585 ++++++++++-------
 utils/wxPython/modules/utils/.cvsignore       |    1 +
 utils/wxPython/modules/utils/msw/utils.cpp    |  212 +-
 utils/wxPython/src/build.cfg                  |   17 +
 utils/wxPython/src/gdi.i                      |   47 +-
 utils/wxPython/src/helpers.cpp                |    2 +-
 utils/wxPython/src/helpers.h                  |  246 +-
 utils/wxPython/src/misc.i                     |   16 +
 utils/wxPython/src/msw/cmndlgs.cpp            |  464 +--
 utils/wxPython/src/msw/controls.cpp           | 1227 ++++----
 utils/wxPython/src/msw/controls2.cpp          | 1101 ++++---
 utils/wxPython/src/msw/events.cpp             |  723 +++--
 utils/wxPython/src/msw/frames.cpp             |  149 +-
 utils/wxPython/src/msw/gdi.cpp                |   30 +-
 utils/wxPython/src/msw/image.cpp              |  310 +-
 utils/wxPython/src/msw/mdi.cpp                |  107 +-
 utils/wxPython/src/msw/misc.cpp               | 1135 +++++---
 utils/wxPython/src/msw/misc.py                |    8 +
 utils/wxPython/src/msw/misc2.cpp              |   58 +-
 utils/wxPython/src/msw/printfw.cpp            |  874 +++---
 utils/wxPython/src/msw/stattool.cpp           |  492 ++--
 utils/wxPython/src/msw/windows.cpp            | 1331 +++++----
 utils/wxPython/src/msw/windows.py             |    3 +
 utils/wxPython/src/msw/windows2.cpp           | 1080 ++++---
 utils/wxPython/src/msw/windows3.cpp           |  345 ++-
 utils/wxPython/src/msw/wx.cpp                 |  230 +-
 utils/wxPython/src/printfw.i                  |    4 +-
 utils/wxPython/src/windows.i                  |  184 +-
 40 files changed, 7774 insertions(+), 5538 deletions(-)
 create mode 100644 utils/wxPython/demo/htmlview.py
 create mode 100644 utils/wxPython/demo/htmlwidget.py

diff --git a/utils/wxPython/.cvsignore b/utils/wxPython/.cvsignore
index 791552a2b0..9ec7166e0a 100644
--- a/utils/wxPython/.cvsignore
+++ b/utils/wxPython/.cvsignore
@@ -14,6 +14,7 @@ __init__.pyc
 __init__.pyc
 __init__.pyo
 __init__.pyo
+build.local
 cmndlgs.py
 cmndlgs.py
 cmndlgs.pyc
@@ -104,6 +105,7 @@ wx.py
 wx.pyc
 wx.pyc
 wx.pyo
+wxPython.doc
 wxc.ilk
 wxc.pdb
 wxc.pyd
diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt
index ee7ec93126..615616bb37 100644
--- a/utils/wxPython/README.txt
+++ b/utils/wxPython/README.txt
@@ -48,13 +48,36 @@ Or you can send mail directly to the list using this address:
 What's new in 2.1b3
 --------------------
 
+This release is syncronized with release 2.1 snapshot 9 of wxWindows.
+
 Switched to using SWIG from CVS (see http://swig.cs.uchicago.edu/cvs.html)
 for some of the new features and such.  Also they have encorporated my
 patches so there is really no reason to stick with the current (very
-old) release...
+old) release...  This version of SWIG gives the following new
+features:
+
+    1. Keyword arguments.  You no longer have to specify all the
+       parameters with defaults to a method just to specify a
+       non-default value on the end.  You can now do this instead:
+
+	  win = wxWindow(parent, -1, style = mystyle)
+
+    2. There is now an an equivalence between Python's None and C++'s
+       NULL.  This means that any methods that might return NULL will
+       now return None and you can use none where wxWindows might be
+       expecting NULL.  This makes things much more snake-ish.
+
+
+There is a new build system based on a new Python program instead of
+raw makefiles.  Now wxPython builds are virtually the same on MSW or
+Unix systems.  See the end of this file for new build instructions and
+see distrib/build.py for more details.
+
+wxDC.Bilt now includes the useMask parameter, and has been split into
+two different versions.  wxDC.BlitXY is like what was there before and
+takes raw coordinants and sizes, and the new wxDC.Blit is for the new
+interface using wxPoints and a wxSize.
 
-New build system based on a Python program.  Now wxPython builds are
-the same on MSW or Unix systems.  See distrib/build.py for details.
 
 
 
@@ -337,6 +360,9 @@ below.)
 
    You can use whatever flags you want, but I know these work.
 
+   For Win32 systems I use Visual C++ 6.0, but 5.0 should work.  The
+   build utility currently does not support any other win32 compilers.
+
 2. At this point you may want to make an alias or symlink, script,
    batch file, whatever on the PATH that invokes
    $(WXWIN)/utils/wxPython/distrib/build.py to help simplify matters
@@ -353,7 +379,7 @@ below.)
    The build.py script actually generates a Makefile based on what it
    finds on your system and information found in the build.cfg file.
    If you have troubles building or you want it built or installed in
-   a different way, take a look at the docstring in build.py, you may
+   a different way, take a look at the docstring in build.py.  You may
    be able to override configuration options in a file named
    build.local.
 
diff --git a/utils/wxPython/demo/Main.py b/utils/wxPython/demo/Main.py
index 69dc714e46..0d820d7ade 100644
--- a/utils/wxPython/demo/Main.py
+++ b/utils/wxPython/demo/Main.py
@@ -109,21 +109,20 @@ class wxPythonDemo(wxFrame):
         self.nb = wxNotebook(splitter2, -1)
 
         # Set up a TextCtrl on the Overview Notebook page
-        self.ovr = wxTextCtrl(self.nb, -1, '', wxDefaultPosition, wxDefaultSize,
-                              wxTE_MULTILINE|wxTE_READONLY)
+        self.ovr = wxTextCtrl(self.nb, -1, style = wxTE_MULTILINE|wxTE_READONLY)
         self.nb.AddPage(self.ovr, "Overview")
 
 
         # Set up a TextCtrl on the Demo Code Notebook page
-        self.txt = wxTextCtrl(self.nb, -1, '', wxDefaultPosition, wxDefaultSize,
-                              wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
+        self.txt = wxTextCtrl(self.nb, -1,
+                              style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         self.txt.SetFont(wxFont(9, wxMODERN, wxNORMAL, wxNORMAL, false))
         self.nb.AddPage(self.txt, "Demo Code")
 
 
         # Set up a log on the View Log Notebook page
-        self.log = wxTextCtrl(splitter2, -1, '', wxDefaultPosition, wxDefaultSize,
-                              wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
+        self.log = wxTextCtrl(splitter2, -1,
+                              style = wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL)
         (w, self.charHeight) = self.log.GetTextExtent('X')
         #self.WriteText('wxPython Demo Log:\n')
 
@@ -154,7 +153,7 @@ class wxPythonDemo(wxFrame):
         numLines = h/self.charHeight
         x, y = self.log.PositionToXY(self.log.GetLastPosition())
         self.log.ShowPosition(self.log.XYToPosition(x, y-numLines))
-##          self.log.ShowPosition(self.log.GetLastPosition())
+        ##self.log.ShowPosition(self.log.GetLastPosition())
         self.log.SetInsertionPointEnd()
 
     def write(self, txt):
diff --git a/utils/wxPython/demo/htmlview.py b/utils/wxPython/demo/htmlview.py
new file mode 100644
index 0000000000..906f3221c1
--- /dev/null
+++ b/utils/wxPython/demo/htmlview.py
@@ -0,0 +1,77 @@
+from wxPython.wx import *
+from wxPython.html import *
+import sys
+
+default_page = """
+<H1>HTML Viewer</H1>Please select <I>File->Open</I>
+to open a HTML file, or edit this page in the
+text control below and select <I>File->Update</I>
+<P>
+The python source can be seen
+<a href="%s">here</a>.
+""" % (sys.argv[0], )
+
+class HtmlViewer(wxFrame):
+	def __init__(self, parent, id, title, pos = wxDefaultPosition, size = wxSize(400,400)):
+		wxFrame.__init__(self, parent, id, title, pos, size)
+                self.CreateStatusBar(1)
+                split = wxSplitterWindow(self, -1)
+                self.html = wxHtmlWindow(split)
+                self.html.SetRelatedFrame(self, "HTML Viewer:  \%s")
+                self.html.SetRelatedStatusBar(0)
+                self.txt = wxTextCtrl(split, -1, default_page,
+                                      wxDefaultPosition, wxDefaultSize,
+                                      wxTE_MULTILINE)
+                split.SplitHorizontally(self.html, self.txt, size.y/2)
+		mbar = wxMenuBar()
+		menu = wxMenu()
+		menu.Append(1500, "Open")
+                menu.Append(1501, "Reset")
+                menu.Append(1502, "Update HTML")
+		menu.AppendSeparator()
+		menu.Append(1503, "Exit")
+		mbar.Append(menu, "File")
+                menu = wxMenu()
+                menu.Append(1510, "Back")
+                menu.Append(1511, "Forward")
+                mbar.Append(menu, "Go")
+		self.SetMenuBar(mbar)
+		self.filename = ""
+                EVT_MENU(self, 1500, self.OnFileOpen)
+                EVT_MENU(self, 1501, self.OnFileReset)
+                EVT_MENU(self, 1502, self.OnFileUpdate)
+                EVT_MENU(self, 1503, self.OnClose)
+                EVT_MENU(self, 1510, self.OnGoBack)
+                EVT_MENU(self, 1511, self.OnGoForward)
+                # A default opening text
+                self.html.SetPage( default_page )
+        def OnFileOpen(self, event):
+		dlg = wxFileDialog(NULL, "Open file")
+		if dlg.ShowModal() == wxID_OK:
+			self.filename = dlg.GetPath()
+                        self.html.LoadPage(self.filename)
+        def OnFileReset(self, event):
+                self.html.SetPage( default_page )
+                self.txt.SetValue( default_page )
+        def OnFileUpdate(self, event):
+                self.html.SetPage( self.txt.GetValue() )
+        def OnGoBack(self, event):
+                self.html.HistoryBack()
+        def OnGoForward(self, event):
+                self.html.HistoryForward()
+	def OnClose(self,event):
+		self.Destroy()
+
+class MyApp(wxApp):
+	def OnInit(self):
+		frame = HtmlViewer(NULL, -1, "HTML Viewer")
+		frame.Show(TRUE)
+		self.SetTopWindow(frame)
+		return TRUE
+
+wxImage_AddHandler(wxPNGHandler())
+wxImage_AddHandler(wxGIFHandler())
+wxImage_AddHandler(wxJPEGHandler())
+
+theApp = MyApp(0)
+theApp.MainLoop()
diff --git a/utils/wxPython/demo/htmlwidget.py b/utils/wxPython/demo/htmlwidget.py
new file mode 100644
index 0000000000..ffa0fcb356
--- /dev/null
+++ b/utils/wxPython/demo/htmlwidget.py
@@ -0,0 +1,97 @@
+from wxPython.wx import *
+from wxPython.html import *
+import sys,string
+
+# A bunch of simple widgets, all somehow derived from wxWindow
+class Widget1(wxWindow):
+    def __init__(self, parent, param):
+	wxWindow.__init__(self, parent, -1)
+	self.text = wxTextCtrl(self, -1, param['param_str'], wxPoint(5,5),
+	                   wxSize(200,150), wxTE_MULTILINE)
+	but = wxButton(self, 1001, "Click me", wxPoint(50,160), wxSize(100,30))
+	EVT_BUTTON(self, 1001, self.OnButton)
+	self.SetSize(wxSize(210,200))
+    def OnButton(self, event):
+	self.text.AppendText( "Click!\n" )
+
+class Widget2(wxButton):
+    def __init__(self, parent, param):
+	wxButton.__init__(self, parent, int(param['id']), param['title'])
+
+class Widget3(wxTextCtrl):
+    def __init__(self, parent, param):
+	wxTextCtrl.__init__(self, parent, -1, "No clicks")
+	self.clicked = 0;
+	EVT_BUTTON(parent, int(param['button_id']), self.OnButton)
+    def OnButton(self, event):
+	self.clicked = self.clicked + 1
+	self.SetValue("%d clicks" % (self.clicked,))
+
+# make the widgets known in the widget module (aka htmlc)
+widget.Widget1 = Widget1
+widget.Widget2 = Widget2
+widget.Widget3 = Widget3
+
+# our default page
+default_page = """
+<H2>wxPython widgets go HTML</H2>
+A bunch of wxPython widgets are scattered on this HTML page.
+Here's one:
+<center><python class="Widget1" greeting="Hello World"></center>
+<hr>
+Here's another:
+<center><python class="Widget2" float=70 id=1002 title="Button A"></center>
+It should always take up 70% of the page width.
+<p>And then there's this, listening to button A:
+<python class="Widget3" button_id=1002></p>
+"""
+
+# our explanation
+apology = """
+For some bizarre reason, it takes forever and a day to display the
+widgets if they are constructed in the frame's constructor. This
+only happens in MSW, wxGTK works fine.
+<p>Select <I>File->Show it</I> to draw the widgets."""
+
+default_page = default_page + "The HTML code for this page is\n <pre>" + default_page + "</pre>"
+
+
+class HtmlViewer(wxFrame):
+	def __init__(self, parent, id, title, pos = wxDefaultPosition, size = wxSize(400,400)):
+		wxFrame.__init__(self, parent, id, title, pos, size)
+                self.CreateStatusBar(1)
+                self.html = wxHtmlWindow(self)
+                self.html.SetRelatedFrame(self, "HTML Viewer:  \%s")
+                self.html.SetRelatedStatusBar(0)
+		mbar = wxMenuBar()
+		menu = wxMenu()
+                menu.Append(1500, "Show it")
+		menu.Append(1503, "Exit")
+		mbar.Append(menu, "File")
+                EVT_MENU(self, 1500, self.OnShowIt)
+                EVT_MENU(self, 1503, self.OnClose)
+                self.SetMenuBar(mbar)
+                # change apology below to default_page, if you dare!
+                self.html.SetPage( default_page )
+	def OnClose(self,event):
+		self.Destroy()
+        def OnShowIt(self,event):
+                self.html.SetPage( default_page )
+                # now quickly remove the menu option, to hide that
+                # other bug; namely that widgets aren't removed when the
+                # HTML page is.
+                self.GetMenuBar().Enable(1500, FALSE)        
+
+class MyApp(wxApp):
+	def OnInit(self):
+		frame = HtmlViewer(NULL, -1, "HTML Viewer")
+		frame.Show(TRUE)
+                self.SetTopWindow(frame)
+		return TRUE
+
+wxImage_AddHandler(wxPNGHandler())
+wxImage_AddHandler(wxGIFHandler())
+wxImage_AddHandler(wxJPEGHandler())
+
+theApp = MyApp(0)
+theApp.MainLoop()
diff --git a/utils/wxPython/demo/wxDialog.py b/utils/wxPython/demo/wxDialog.py
index a22a528248..f7a2cf1adf 100644
--- a/utils/wxPython/demo/wxDialog.py
+++ b/utils/wxPython/demo/wxDialog.py
@@ -8,7 +8,7 @@ def runTest(frame, nb, log):
 
     wxStaticText(win, -1, "This is a wxDialog", wxPoint(20, 20))
     wxButton(win, wxID_OK,     " OK ", wxPoint(75, 120), wxDefaultSize).SetDefault()
-    wxButton(win, wxID_CANCEL, " Cancel ", wxPoint(150, 120), wxDefaultSize)
+    wxButton(win, wxID_CANCEL, " Cancel ", wxPoint(200, 120), wxDefaultSize)
 
     val = win.ShowModal()
     if val == wxID_OK:
diff --git a/utils/wxPython/demo/wxTimer.py b/utils/wxPython/demo/wxTimer.py
index a32f3d3500..14ad594100 100644
--- a/utils/wxPython/demo/wxTimer.py
+++ b/utils/wxPython/demo/wxTimer.py
@@ -29,7 +29,7 @@ class TestTimerWin(wxPanel):
                                wxPoint(15, 30))
 
         wxButton(self, 11101, ' Start ', wxPoint(15, 75), wxDefaultSize)
-        wxButton(self, 11102, ' Stop ', wxPoint(77, 75), wxDefaultSize)
+        wxButton(self, 11102, ' Stop ', wxPoint(115, 75), wxDefaultSize)
         EVT_BUTTON(self, 11101, self.OnStart)
         EVT_BUTTON(self, 11102, self.OnStop)
 
diff --git a/utils/wxPython/distrib/build.py b/utils/wxPython/distrib/build.py
index 02b3673c8f..6bd2fefaf7 100755
--- a/utils/wxPython/distrib/build.py
+++ b/utils/wxPython/distrib/build.py
@@ -220,7 +220,7 @@ class BuildConfig:
         self.VERSION = __version__
         self.MODULE = ''
         self.SWIGFILES = []
-        self.SWIGFLAGS = '-c++ -shadow -python -dnone -I$(WXPSRCDIR)'
+        self.SWIGFLAGS = '-c++ -shadow -python -keyword -dnone -I$(WXPSRCDIR)'
         self.SOURCES = []
         self.PYFILES = []
         self.LFLAGS = ''
@@ -230,6 +230,7 @@ class BuildConfig:
         self.OTHERLIBS = ''
         self.OTHERTARGETS = ''
         self.OTHERINSTALLTARGETS = ''
+        self.OTHERUNINSTALLTARGETS = ''
         self.OTHERRULES = ''
         self.DEFAULTRULE = 'default: $(GENCODEDIR) $(TARGET)'
         self.PYVERSION = sys.version[:3]
@@ -469,8 +470,8 @@ WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
-CFLAGS = %(CFLAGS)s %(OTHERCFLAGS)s
-LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
+CFLAGS = %(CFLAGS)s
+LFLAGS = %(LFLAGS)s
 PYVERSION = %(PYVERSION)s
 PYPREFIX = %(PYPREFIX)s
 EXECPREFIX = %(EXECPREFIX)s
@@ -505,8 +506,8 @@ THREAD=-DWXP_USE_THREAD=1
 
 
 NOPCH=1
-OVERRIDEFLAGS=%(OVERRIDEFLAGS)s %(OTHERCFLAGS)s
-EXTRAFLAGS = %(CFLAGS)s
+OVERRIDEFLAGS=%(OVERRIDEFLAGS)s
+EXTRAFLAGS = $(CFLAGS) %(OTHERCFLAGS)s
 
 LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
 EXTRALIBS = %(LIBS)s %(OTHERLIBS)s
@@ -537,7 +538,7 @@ clean:
 	-erase $(TARGET)
 
 
-uninstall:
+uninstall: %(OTHERUNINSTALLTARGETS)s
 	-erase $(TARGETDIR)\\$(TARGET)
 %(PYCLEANUP)s
 
@@ -611,6 +612,13 @@ $(GENCODEDIR):
 
 #----------------------------------------------------------------------
 
+showflags:
+	@echo CPPFLAGS:
+	@echo $(CPPFLAGS)
+	@echo LFLAGS:
+	@echo $(LFLAGS)
+
+
 
 %(OTHERRULES)s
 '''
@@ -631,7 +639,7 @@ WXDIR = %(WXDIR)s
 VERSION = %(VERSION)s
 MODULE = %(MODULE)s
 SWIGFLAGS = %(SWIGFLAGS)s %(SWIGTOOLKITFLAG)s %(OTHERSWIGFLAGS)s
-CFLAGS = %(CFLAGS)s %(OTHERCFLAGS)s
+CFLAGS = %(CFLAGS)s $(OPT) %(OTHERCFLAGS)s
 LFLAGS = %(LFLAGS)s %(OTHERLFLAGS)s
 LIBS = %(LIBS)s %(OTHERLIBS)s
 PYVERSION = %(PYVERSION)s
@@ -679,7 +687,7 @@ clean:
 	-rm -f *.o *$(SO) *~
 	-rm -f $(TARGET)
 
-uninstall:
+uninstall: %(OTHERUNINSTALLTARGETS)s
 	-rm -f $(TARGETDIR)/$(TARGET)
 %(PYCLEANUP)s
 
diff --git a/utils/wxPython/distrib/wxPython.rsp b/utils/wxPython/distrib/wxPython.rsp
index 4a6fc93634..3b1d321a1b 100644
--- a/utils/wxPython/distrib/wxPython.rsp
+++ b/utils/wxPython/distrib/wxPython.rsp
@@ -9,12 +9,15 @@ wxPython/demo/bitmaps/*.jpg
 wxPython/demo/README.txt
 wxPython/demo/*.xml
 
+wxPython/distrib/build.py
+
 wxPython/lib/*.py
 wxPython/lib/*.txt
 wxPython/lib/sizers/*.py
 wxPython/lib/sizers/*.txt
 
 
+wxPython/src/build.cfg
 wxPython/src/*.i
 wxPython/src/*.py
 wxPython/src/*.cpp
@@ -23,9 +26,6 @@ wxPython/src/*.h
 wxPython/src/*.ico
 wxPython/src/*.def
 wxPython/src/*.rc
-wxPython/src/makefile.*
-wxPython/src/Makefile.pre.in
-wxPython/src/Setup.*
 
 wxPython/src/msw/*.cpp
 wxPython/src/msw/*.h
@@ -39,8 +39,64 @@ wxpython/src/motif/*.cpp
 wxPython/src/motif/*.h
 wxPython/src/motif/*.py
 
-wxPython/src/qt/*.cpp
-wxPython/src/qt/*.h
-wxPython/src/qt/*.py
 
-wxPython/SWIG.patches/*.patch
+wxPython/modules/html/build.cfg
+wxPython/modules/html/*.i
+wxPython/modules/html/*.py
+wxPython/modules/html/*.cpp
+wxPython/modules/html/*.c
+wxPython/modules/html/*.h
+wxPython/modules/html/*.def
+wxPython/modules/html/*.rc
+wxPython/modules/html/msw/*.cpp
+wxPython/modules/html/msw/*.h
+wxPython/modules/html/msw/*.py
+wxPython/modules/html/gtk/*.cpp
+wxPython/modules/html/gtk/*.h
+wxPython/modules/html/gtk/*.py
+
+wxPython/modules/glcanvas/build.cfg
+wxPython/modules/glcanvas/*.i
+wxPython/modules/glcanvas/*.py
+wxPython/modules/glcanvas/*.cpp
+wxPython/modules/glcanvas/*.c
+wxPython/modules/glcanvas/*.h
+wxPython/modules/glcanvas/*.def
+wxPython/modules/glcanvas/*.rc
+wxPython/modules/glcanvas/msw/*.cpp
+wxPython/modules/glcanvas/msw/*.h
+wxPython/modules/glcanvas/msw/*.py
+wxPython/modules/glcanvas/gtk/*.cpp
+wxPython/modules/glcanvas/gtk/*.h
+wxPython/modules/glcanvas/gtk/*.py
+
+wxPython/modules/utils/build.cfg
+wxPython/modules/utils/*.i
+wxPython/modules/utils/*.py
+wxPython/modules/utils/*.cpp
+wxPython/modules/utils/*.c
+wxPython/modules/utils/*.h
+wxPython/modules/utils/*.def
+wxPython/modules/utils/*.rc
+wxPython/modules/utils/msw/*.cpp
+wxPython/modules/utils/msw/*.h
+wxPython/modules/utils/msw/*.py
+wxPython/modules/utils/gtk/*.cpp
+wxPython/modules/utils/gtk/*.h
+wxPython/modules/utils/gtk/*.py
+
+wxPython/modules/ogl/build.cfg
+wxPython/modules/ogl/*.i
+wxPython/modules/ogl/*.py
+wxPython/modules/ogl/*.cpp
+wxPython/modules/ogl/*.c
+wxPython/modules/ogl/*.h
+wxPython/modules/ogl/*.def
+wxPython/modules/ogl/*.rc
+wxPython/modules/ogl/msw/*.cpp
+wxPython/modules/ogl/msw/*.h
+wxPython/modules/ogl/msw/*.py
+wxPython/modules/ogl/gtk/*.cpp
+wxPython/modules/ogl/gtk/*.h
+wxPython/modules/ogl/gtk/*.py
+
diff --git a/utils/wxPython/distrib/wxPython.wse b/utils/wxPython/distrib/wxPython.wse
index 87e4fc4328..55cb10fded 100644
--- a/utils/wxPython/distrib/wxPython.wse
+++ b/utils/wxPython/distrib/wxPython.wse
@@ -17,7 +17,7 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=wxPython-2.1b2.exe
+  EXE Filename=wxPython-2.1b3.exe
   FTP Cluster Size=20
   Per-User Version ID=1
   Dialogs Version=6
@@ -822,8 +822,8 @@ item: Install File
   Flags=0000001010000011
 end
 item: Install File
-  Source=e:\projects\wx\lib\wx21b8.dll
-  Destination=%SYS%\wx21b8.dll
+  Source=e:\projects\wx\lib\wx21b9.dll
+  Destination=%SYS%\wx21b9.dll
   Flags=0000001010010010
 end
 item: Install File
diff --git a/utils/wxPython/distrib/wxPython.wsm b/utils/wxPython/distrib/wxPython.wsm
index aef1c815927fbedaeb9111869f771c915418ac85..b6fdc451e71f156dc11f78b6c5e51ce8e3cf3190 100644
GIT binary patch
literal 33
lcmWF!_BHdAWnf@rP*gYF<d~+*&@Roy00NAm<tmB33;<}E1=|1s

literal 4
LcmWF!_B8_l11SM6

diff --git a/utils/wxPython/modules/glcanvas/build.cfg b/utils/wxPython/modules/glcanvas/build.cfg
index fb9ad4b057..555ab8f75c 100644
--- a/utils/wxPython/modules/glcanvas/build.cfg
+++ b/utils/wxPython/modules/glcanvas/build.cfg
@@ -3,7 +3,7 @@ import sys
 
 MODULE = 'glcanvasc'
 SWIGFILES = ['glcanvas.i', ]
-OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\%s' % (GENCODEDIR,)
+
 
 # Special action; for win32 we require you make the glcanvas lib. The
 # makefile will copy it to WXWIN\lib
@@ -11,10 +11,12 @@ OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\%s' % (GENCODEDIR,)
 # file ourselves...
 if sys.platform == 'win32':
     OTHERLIBS = '$(WXDIR)\lib\glcanvas.lib glu32.lib opengl32.lib'
+    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\win'
 else:
     SOURCES = [GENCODEDIR+'/_glcanvas.cpp']
     print "Warning: Assuming MesaGL libraries. Override OTHERLIBS in build.local\n"\
           "         if you have native GL!"
+    OTHERCFLAGS = '-DWITH_GLCANVAS -I$(WXDIR)\utils\glcanvas\gtk'
     OTHERLIBS = "-lMesaGL -lMesaGLU"
     OTHERRULES = """
 $(GENCODEDIR)/_glcanvas.cpp :
diff --git a/utils/wxPython/modules/glcanvas/msw/glcanvas.cpp b/utils/wxPython/modules/glcanvas/msw/glcanvas.cpp
index 4518b46da7..7169a92993 100644
--- a/utils/wxPython/modules/glcanvas/msw/glcanvas.cpp
+++ b/utils/wxPython/modules/glcanvas/msw/glcanvas.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 802)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -124,12 +124,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_glArrayElementEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glArrayElementEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
+    char *_kwnames[] = { "i", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glArrayElementEXT",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glArrayElementEXT",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -141,7 +142,7 @@ static PyObject *_wrap_glArrayElementEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColorPointerEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColorPointerEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLenum  _arg1;
@@ -149,9 +150,10 @@ static PyObject *_wrap_glColorPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg3;
     GLvoid * _arg4;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "size","type","stride","count","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiO:glColorPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiO:glColorPointerEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo4) {
         if (_argo4 == Py_None) { _arg4 = NULL; }
@@ -170,14 +172,15 @@ static PyObject *_wrap_glColorPointerEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDrawArraysEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDrawArraysEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
     GLsizei  _arg2;
+    char *_kwnames[] = { "mode","first","count", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glDrawArraysEXT",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glDrawArraysEXT",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -189,15 +192,16 @@ static PyObject *_wrap_glDrawArraysEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEdgeFlagPointerEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEdgeFlagPointerEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLsizei  _arg1;
     GLboolean * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "stride","count","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glEdgeFlagPointerEXT",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glEdgeFlagPointerEXT",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -216,14 +220,15 @@ static PyObject *_wrap_glEdgeFlagPointerEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetPointervEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetPointervEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLvoid ** _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetPointervEXT",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetPointervEXT",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -242,16 +247,17 @@ static PyObject *_wrap_glGetPointervEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexPointerEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexPointerEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "type","stride","count","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glIndexPointerEXT",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glIndexPointerEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -270,16 +276,17 @@ static PyObject *_wrap_glIndexPointerEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormalPointerEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormalPointerEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "type","stride","count","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glNormalPointerEXT",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glNormalPointerEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -298,7 +305,7 @@ static PyObject *_wrap_glNormalPointerEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoordPointerEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoordPointerEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLenum  _arg1;
@@ -306,9 +313,10 @@ static PyObject *_wrap_glTexCoordPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg3;
     GLvoid * _arg4;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "size","type","stride","count","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiO:glTexCoordPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiO:glTexCoordPointerEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo4) {
         if (_argo4 == Py_None) { _arg4 = NULL; }
@@ -327,7 +335,7 @@ static PyObject *_wrap_glTexCoordPointerEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertexPointerEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertexPointerEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLenum  _arg1;
@@ -335,9 +343,10 @@ static PyObject *_wrap_glVertexPointerEXT(PyObject *self, PyObject *args) {
     GLsizei  _arg3;
     GLvoid * _arg4;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "size","type","stride","count","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiO:glVertexPointerEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiO:glVertexPointerEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo4) {
         if (_argo4 == Py_None) { _arg4 = NULL; }
@@ -356,7 +365,7 @@ static PyObject *_wrap_glVertexPointerEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColorSubtableEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColorSubtableEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
@@ -365,9 +374,10 @@ static PyObject *_wrap_glColorSubtableEXT(PyObject *self, PyObject *args) {
     GLenum  _arg4;
     GLvoid * _arg5;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "target","start","count","format","type","table", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiO:glColorSubtableEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiO:glColorSubtableEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
         return NULL;
     if (_argo5) {
         if (_argo5 == Py_None) { _arg5 = NULL; }
@@ -386,7 +396,7 @@ static PyObject *_wrap_glColorSubtableEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColorTableEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColorTableEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
@@ -395,9 +405,10 @@ static PyObject *_wrap_glColorTableEXT(PyObject *self, PyObject *args) {
     GLenum  _arg4;
     GLvoid * _arg5;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "target","internalformat","width","format","type","table", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiO:glColorTableEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiO:glColorTableEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
         return NULL;
     if (_argo5) {
         if (_argo5 == Py_None) { _arg5 = NULL; }
@@ -416,16 +427,17 @@ static PyObject *_wrap_glColorTableEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCopyColorTableEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCopyColorTableEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint  _arg2;
     GLint  _arg3;
     GLsizei  _arg4;
+    char *_kwnames[] = { "target","internalformat","x","y","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiii:glCopyColorTableEXT",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiii:glCopyColorTableEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -437,16 +449,17 @@ static PyObject *_wrap_glCopyColorTableEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetColorTableEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetColorTableEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLenum  _arg2;
     GLvoid * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "target","format","type","table", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glGetColorTableEXT",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glGetColorTableEXT",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -465,15 +478,16 @@ static PyObject *_wrap_glGetColorTableEXT(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetColorTableParamaterfvEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetColorTableParamaterfvEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetColorTableParamaterfvEXT",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetColorTableParamaterfvEXT",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -492,15 +506,16 @@ static PyObject *_wrap_glGetColorTableParamaterfvEXT(PyObject *self, PyObject *a
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetColorTavleParameterivEXT(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetColorTavleParameterivEXT(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetColorTavleParameterivEXT",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetColorTavleParameterivEXT",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -519,13 +534,14 @@ static PyObject *_wrap_glGetColorTavleParameterivEXT(PyObject *self, PyObject *a
     return _resultobj;
 }
 
-static PyObject *_wrap_glLockArraysSGI(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLockArraysSGI(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLsizei  _arg1;
+    char *_kwnames[] = { "first","count", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glLockArraysSGI",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glLockArraysSGI",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -537,11 +553,12 @@ static PyObject *_wrap_glLockArraysSGI(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glUnlockArraysSGI(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glUnlockArraysSGI(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glUnlockArraysSGI")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glUnlockArraysSGI",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -553,14 +570,15 @@ static PyObject *_wrap_glUnlockArraysSGI(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCullParameterdvSGI(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCullParameterdvSGI(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glCullParameterdvSGI",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glCullParameterdvSGI",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -579,14 +597,15 @@ static PyObject *_wrap_glCullParameterdvSGI(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCullParameterfvSGI(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCullParameterfvSGI(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glCullParameterfvSGI",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glCullParameterfvSGI",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -605,13 +624,14 @@ static PyObject *_wrap_glCullParameterfvSGI(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexFuncSGI(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexFuncSGI(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLclampf  _arg1;
+    char *_kwnames[] = { "func","ref", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"if:glIndexFuncSGI",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"if:glIndexFuncSGI",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -623,13 +643,14 @@ static PyObject *_wrap_glIndexFuncSGI(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexMaterialSGI(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexMaterialSGI(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
+    char *_kwnames[] = { "face","mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glIndexMaterialSGI",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glIndexMaterialSGI",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -641,15 +662,16 @@ static PyObject *_wrap_glIndexMaterialSGI(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glAddSwapHintRectWin(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glAddSwapHintRectWin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLsizei  _arg2;
     GLsizei  _arg3;
+    char *_kwnames[] = { "x","y","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glAddSwapHintRectWin",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glAddSwapHintRectWin",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -661,13 +683,14 @@ static PyObject *_wrap_glAddSwapHintRectWin(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glAccum(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glAccum(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "op","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"if:glAccum",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"if:glAccum",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -679,13 +702,14 @@ static PyObject *_wrap_glAccum(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glAlphaFunc(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glAlphaFunc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLclampf  _arg1;
+    char *_kwnames[] = { "func","ref", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"if:glAlphaFunc",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"if:glAlphaFunc",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -697,7 +721,7 @@ static PyObject *_wrap_glAlphaFunc(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glAreTexturesResident(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glAreTexturesResident(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean  _result;
     GLsizei  _arg0;
@@ -705,9 +729,10 @@ static PyObject *_wrap_glAreTexturesResident(PyObject *self, PyObject *args) {
     GLboolean * _arg2;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "n","textures","residences", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iOO:glAreTexturesResident",&_arg0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iOO:glAreTexturesResident",_kwnames,&_arg0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -732,12 +757,13 @@ static PyObject *_wrap_glAreTexturesResident(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glArrayElement(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glArrayElement(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
+    char *_kwnames[] = { "i", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glArrayElement",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glArrayElement",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -749,12 +775,13 @@ static PyObject *_wrap_glArrayElement(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glBegin(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glBegin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glBegin",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glBegin",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -766,13 +793,14 @@ static PyObject *_wrap_glBegin(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glBindTexture(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glBindTexture(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLuint  _arg1;
+    char *_kwnames[] = { "target","texture", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glBindTexture",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glBindTexture",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -784,7 +812,7 @@ static PyObject *_wrap_glBindTexture(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLsizei  _arg1;
@@ -794,9 +822,10 @@ static PyObject *_wrap_glBitmap(PyObject *self, PyObject *args) {
     GLfloat  _arg5;
     GLubyte * _arg6;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "width","height","xorig","yorig","xmove","ymove","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiffffO:glBitmap",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiffffO:glBitmap",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
         return NULL;
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
@@ -815,13 +844,14 @@ static PyObject *_wrap_glBitmap(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glBlendFunc(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glBlendFunc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
+    char *_kwnames[] = { "sfactor","dfactor", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glBlendFunc",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glBlendFunc",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -833,12 +863,13 @@ static PyObject *_wrap_glBlendFunc(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCallList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCallList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
+    char *_kwnames[] = { "list", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glCallList",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glCallList",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -850,15 +881,16 @@ static PyObject *_wrap_glCallList(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCallLists(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCallLists(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLenum  _arg1;
     GLvoid * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "n","type","lists", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glCallLists",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glCallLists",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -877,12 +909,13 @@ static PyObject *_wrap_glCallLists(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glClear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glClear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbitfield  _arg0;
+    char *_kwnames[] = { "mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glClear",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glClear",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -894,15 +927,16 @@ static PyObject *_wrap_glClear(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glClearAccum(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glClearAccum(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
     GLfloat  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glClearAccum",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glClearAccum",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -914,15 +948,16 @@ static PyObject *_wrap_glClearAccum(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glClearColor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glClearColor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLclampf  _arg0;
     GLclampf  _arg1;
     GLclampf  _arg2;
     GLclampf  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glClearColor",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glClearColor",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -934,12 +969,13 @@ static PyObject *_wrap_glClearColor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glClearDepth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glClearDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLclampd  _arg0;
+    char *_kwnames[] = { "depth", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"d:glClearDepth",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"d:glClearDepth",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -951,12 +987,13 @@ static PyObject *_wrap_glClearDepth(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glClearIndex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glClearIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"f:glClearIndex",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"f:glClearIndex",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -968,12 +1005,13 @@ static PyObject *_wrap_glClearIndex(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glClearStencil(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glClearStencil(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
+    char *_kwnames[] = { "s", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glClearStencil",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glClearStencil",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -985,14 +1023,15 @@ static PyObject *_wrap_glClearStencil(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glClipPlane(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glClipPlane(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "plane","equation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glClipPlane",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glClipPlane",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -1011,14 +1050,15 @@ static PyObject *_wrap_glClipPlane(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3b(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3b(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbyte  _arg0;
     GLbyte  _arg1;
     GLbyte  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"bbb:glColor3b",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"bbb:glColor3b",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1030,13 +1070,14 @@ static PyObject *_wrap_glColor3b(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3bv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3bv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3bv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3bv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1055,14 +1096,15 @@ static PyObject *_wrap_glColor3bv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ddd:glColor3d",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ddd:glColor3d",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1074,13 +1116,14 @@ static PyObject *_wrap_glColor3d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1099,14 +1142,15 @@ static PyObject *_wrap_glColor3dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"fff:glColor3f",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"fff:glColor3f",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1118,13 +1162,14 @@ static PyObject *_wrap_glColor3f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1143,14 +1188,15 @@ static PyObject *_wrap_glColor3fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glColor3i",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glColor3i",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1162,13 +1208,14 @@ static PyObject *_wrap_glColor3i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1187,14 +1234,15 @@ static PyObject *_wrap_glColor3iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhh:glColor3s",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhh:glColor3s",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1206,13 +1254,14 @@ static PyObject *_wrap_glColor3s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1231,14 +1280,15 @@ static PyObject *_wrap_glColor3sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3ub(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3ub(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte  _arg0;
     GLubyte  _arg1;
     GLubyte  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"bbb:glColor3ub",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"bbb:glColor3ub",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1250,13 +1300,14 @@ static PyObject *_wrap_glColor3ub(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3ubv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3ubv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3ubv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3ubv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1275,14 +1326,15 @@ static PyObject *_wrap_glColor3ubv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3ui(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3ui(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
     GLuint  _arg1;
     GLuint  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glColor3ui",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glColor3ui",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1294,13 +1346,14 @@ static PyObject *_wrap_glColor3ui(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3uiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3uiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3uiv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3uiv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1319,14 +1372,15 @@ static PyObject *_wrap_glColor3uiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3us(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3us(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLushort  _arg0;
     GLushort  _arg1;
     GLushort  _arg2;
+    char *_kwnames[] = { "red","green","blue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhh:glColor3us",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhh:glColor3us",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1338,13 +1392,14 @@ static PyObject *_wrap_glColor3us(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor3usv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor3usv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLushort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor3usv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor3usv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1363,15 +1418,16 @@ static PyObject *_wrap_glColor3usv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4b(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4b(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbyte  _arg0;
     GLbyte  _arg1;
     GLbyte  _arg2;
     GLbyte  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"bbbb:glColor4b",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"bbbb:glColor4b",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1383,13 +1439,14 @@ static PyObject *_wrap_glColor4b(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4bv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4bv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4bv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4bv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1408,15 +1465,16 @@ static PyObject *_wrap_glColor4bv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
     GLdouble  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddd:glColor4d",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddd:glColor4d",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1428,13 +1486,14 @@ static PyObject *_wrap_glColor4d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1453,15 +1512,16 @@ static PyObject *_wrap_glColor4dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
     GLfloat  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glColor4f",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glColor4f",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1473,13 +1533,14 @@ static PyObject *_wrap_glColor4f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1498,15 +1559,16 @@ static PyObject *_wrap_glColor4fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
     GLint  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glColor4i",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glColor4i",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1518,13 +1580,14 @@ static PyObject *_wrap_glColor4i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1543,15 +1606,16 @@ static PyObject *_wrap_glColor4iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
     GLshort  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhhh:glColor4s",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhhh:glColor4s",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1563,13 +1627,14 @@ static PyObject *_wrap_glColor4s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1588,15 +1653,16 @@ static PyObject *_wrap_glColor4sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4ub(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4ub(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte  _arg0;
     GLubyte  _arg1;
     GLubyte  _arg2;
     GLubyte  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"bbbb:glColor4ub",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"bbbb:glColor4ub",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1608,13 +1674,14 @@ static PyObject *_wrap_glColor4ub(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4ubv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4ubv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4ubv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4ubv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1633,15 +1700,16 @@ static PyObject *_wrap_glColor4ubv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4ui(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4ui(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
     GLuint  _arg1;
     GLuint  _arg2;
     GLuint  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glColor4ui",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glColor4ui",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1653,13 +1721,14 @@ static PyObject *_wrap_glColor4ui(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4uiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4uiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4uiv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4uiv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1678,15 +1747,16 @@ static PyObject *_wrap_glColor4uiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4us(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4us(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLushort  _arg0;
     GLushort  _arg1;
     GLushort  _arg2;
     GLushort  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhhh:glColor4us",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhhh:glColor4us",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1698,13 +1768,14 @@ static PyObject *_wrap_glColor4us(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColor4usv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColor4usv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLushort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glColor4usv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glColor4usv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1723,15 +1794,16 @@ static PyObject *_wrap_glColor4usv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColorMask(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColorMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean  _arg0;
     GLboolean  _arg1;
     GLboolean  _arg2;
     GLboolean  _arg3;
+    char *_kwnames[] = { "red","green","blue","alpha", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"bbbb:glColorMask",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"bbbb:glColorMask",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1743,13 +1815,14 @@ static PyObject *_wrap_glColorMask(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColorMaterial(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColorMaterial(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
+    char *_kwnames[] = { "face","mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glColorMaterial",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glColorMaterial",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1761,16 +1834,17 @@ static PyObject *_wrap_glColorMaterial(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glColorPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glColorPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "size","type","stride","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glColorPointer",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glColorPointer",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -1789,16 +1863,17 @@ static PyObject *_wrap_glColorPointer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCopyPixels(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCopyPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLsizei  _arg2;
     GLsizei  _arg3;
     GLenum  _arg4;
+    char *_kwnames[] = { "x","y","width","height","type", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiii:glCopyPixels",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiii:glCopyPixels",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1810,7 +1885,7 @@ static PyObject *_wrap_glCopyPixels(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCopyTexImage1D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCopyTexImage1D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -1819,9 +1894,10 @@ static PyObject *_wrap_glCopyTexImage1D(PyObject *self, PyObject *args) {
     GLint  _arg4;
     GLsizei  _arg5;
     GLint  _arg6;
+    char *_kwnames[] = { "target","level","internalFormat","x","y","width","border", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiii:glCopyTexImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiii:glCopyTexImage1D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1833,7 +1909,7 @@ static PyObject *_wrap_glCopyTexImage1D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCopyTexImage2D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCopyTexImage2D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -1843,9 +1919,10 @@ static PyObject *_wrap_glCopyTexImage2D(PyObject *self, PyObject *args) {
     GLsizei  _arg5;
     GLsizei  _arg6;
     GLint  _arg7;
+    char *_kwnames[] = { "target","level","internalFormat","x","y","width","height","border", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiiii:glCopyTexImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiiii:glCopyTexImage2D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1857,7 +1934,7 @@ static PyObject *_wrap_glCopyTexImage2D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCopyTexSubImage1D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCopyTexSubImage1D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -1865,9 +1942,10 @@ static PyObject *_wrap_glCopyTexSubImage1D(PyObject *self, PyObject *args) {
     GLint  _arg3;
     GLint  _arg4;
     GLsizei  _arg5;
+    char *_kwnames[] = { "target","level","xoffset","x","y","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiii:glCopyTexSubImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiii:glCopyTexSubImage1D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1879,7 +1957,7 @@ static PyObject *_wrap_glCopyTexSubImage1D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCopyTexSubImage2D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCopyTexSubImage2D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -1889,9 +1967,10 @@ static PyObject *_wrap_glCopyTexSubImage2D(PyObject *self, PyObject *args) {
     GLint  _arg5;
     GLsizei  _arg6;
     GLsizei  _arg7;
+    char *_kwnames[] = { "target","level","xoffset","yoffset","x","y","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiiii:glCopyTexSubImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiiii:glCopyTexSubImage2D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1903,12 +1982,13 @@ static PyObject *_wrap_glCopyTexSubImage2D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glCullFace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glCullFace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glCullFace",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glCullFace",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1920,13 +2000,14 @@ static PyObject *_wrap_glCullFace(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDeleteLists(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDeleteLists(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
     GLsizei  _arg1;
+    char *_kwnames[] = { "list","range", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glDeleteLists",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glDeleteLists",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1938,14 +2019,15 @@ static PyObject *_wrap_glDeleteLists(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDeleteTextures(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDeleteTextures(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "n","textures", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glDeleteTextures",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glDeleteTextures",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -1964,12 +2046,13 @@ static PyObject *_wrap_glDeleteTextures(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDepthFunc(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDepthFunc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "func", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glDepthFunc",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glDepthFunc",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1981,12 +2064,13 @@ static PyObject *_wrap_glDepthFunc(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDepthMask(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDepthMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean  _arg0;
+    char *_kwnames[] = { "flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"b:glDepthMask",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"b:glDepthMask",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1998,13 +2082,14 @@ static PyObject *_wrap_glDepthMask(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDepthRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDepthRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLclampd  _arg0;
     GLclampd  _arg1;
+    char *_kwnames[] = { "zNear","zFar", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dd:glDepthRange",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dd:glDepthRange",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2016,12 +2101,13 @@ static PyObject *_wrap_glDepthRange(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDisable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDisable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "cap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glDisable",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glDisable",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2033,12 +2119,13 @@ static PyObject *_wrap_glDisable(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDisableClientState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDisableClientState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "array", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glDisableClientState",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glDisableClientState",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2050,14 +2137,15 @@ static PyObject *_wrap_glDisableClientState(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDrawArrays(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDrawArrays(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
     GLsizei  _arg2;
+    char *_kwnames[] = { "mode","first","count", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glDrawArrays",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glDrawArrays",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2069,12 +2157,13 @@ static PyObject *_wrap_glDrawArrays(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDrawBuffer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDrawBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glDrawBuffer",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glDrawBuffer",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2086,16 +2175,17 @@ static PyObject *_wrap_glDrawBuffer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDrawElements(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDrawElements(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLenum  _arg2;
     GLvoid * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "mode","count","type","indices", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glDrawElements",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glDrawElements",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -2114,7 +2204,7 @@ static PyObject *_wrap_glDrawElements(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glDrawPixels(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glDrawPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLsizei  _arg1;
@@ -2122,9 +2212,10 @@ static PyObject *_wrap_glDrawPixels(PyObject *self, PyObject *args) {
     GLenum  _arg3;
     GLvoid * _arg4;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "width","height","format","type","pixels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiO:glDrawPixels",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiO:glDrawPixels",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo4) {
         if (_argo4 == Py_None) { _arg4 = NULL; }
@@ -2143,12 +2234,13 @@ static PyObject *_wrap_glDrawPixels(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEdgeFlag(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEdgeFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean  _arg0;
+    char *_kwnames[] = { "flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"b:glEdgeFlag",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"b:glEdgeFlag",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2160,14 +2252,15 @@ static PyObject *_wrap_glEdgeFlag(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEdgeFlagPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEdgeFlagPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLboolean * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "stride","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glEdgeFlagPointer",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glEdgeFlagPointer",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2186,13 +2279,14 @@ static PyObject *_wrap_glEdgeFlagPointer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEdgeFlagv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEdgeFlagv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glEdgeFlagv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glEdgeFlagv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2211,12 +2305,13 @@ static PyObject *_wrap_glEdgeFlagv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEnable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEnable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "cap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glEnable",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glEnable",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2228,12 +2323,13 @@ static PyObject *_wrap_glEnable(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEnableClientState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEnableClientState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "array", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glEnableClientState",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glEnableClientState",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2245,11 +2341,12 @@ static PyObject *_wrap_glEnableClientState(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEnd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glEnd")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glEnd",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2261,11 +2358,12 @@ static PyObject *_wrap_glEnd(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEndList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEndList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glEndList")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glEndList",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2277,12 +2375,13 @@ static PyObject *_wrap_glEndList(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord1d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord1d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
+    char *_kwnames[] = { "u", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"d:glEvalCoord1d",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"d:glEvalCoord1d",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2294,13 +2393,14 @@ static PyObject *_wrap_glEvalCoord1d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord1dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord1dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "u", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glEvalCoord1dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glEvalCoord1dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2319,12 +2419,13 @@ static PyObject *_wrap_glEvalCoord1dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord1f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord1f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
+    char *_kwnames[] = { "u", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"f:glEvalCoord1f",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"f:glEvalCoord1f",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2336,13 +2437,14 @@ static PyObject *_wrap_glEvalCoord1f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord1fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord1fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "u", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glEvalCoord1fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glEvalCoord1fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2361,13 +2463,14 @@ static PyObject *_wrap_glEvalCoord1fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord2d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord2d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
+    char *_kwnames[] = { "u","v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dd:glEvalCoord2d",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dd:glEvalCoord2d",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2379,13 +2482,14 @@ static PyObject *_wrap_glEvalCoord2d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord2dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord2dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "u", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glEvalCoord2dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glEvalCoord2dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2404,13 +2508,14 @@ static PyObject *_wrap_glEvalCoord2dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord2f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord2f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "u","v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ff:glEvalCoord2f",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ff:glEvalCoord2f",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2422,13 +2527,14 @@ static PyObject *_wrap_glEvalCoord2f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalCoord2fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalCoord2fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "u", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glEvalCoord2fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glEvalCoord2fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2447,14 +2553,15 @@ static PyObject *_wrap_glEvalCoord2fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalMesh1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalMesh1(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "mode","i1","i2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glEvalMesh1",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glEvalMesh1",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2466,16 +2573,17 @@ static PyObject *_wrap_glEvalMesh1(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalMesh2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalMesh2(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
     GLint  _arg2;
     GLint  _arg3;
     GLint  _arg4;
+    char *_kwnames[] = { "mode","i1","i2","j1","j2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiii:glEvalMesh2",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiii:glEvalMesh2",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2487,12 +2595,13 @@ static PyObject *_wrap_glEvalMesh2(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalPoint1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalPoint1(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
+    char *_kwnames[] = { "i", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glEvalPoint1",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glEvalPoint1",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2504,13 +2613,14 @@ static PyObject *_wrap_glEvalPoint1(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glEvalPoint2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glEvalPoint2(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "i","j", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glEvalPoint2",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glEvalPoint2",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2522,15 +2632,16 @@ static PyObject *_wrap_glEvalPoint2(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFeedbackBuffer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFeedbackBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "size","type","buffer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glFeedbackBuffer",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glFeedbackBuffer",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -2549,11 +2660,12 @@ static PyObject *_wrap_glFeedbackBuffer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFinish(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFinish(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glFinish")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glFinish",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2565,11 +2677,12 @@ static PyObject *_wrap_glFinish(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFlush(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFlush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glFlush")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glFlush",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2581,13 +2694,14 @@ static PyObject *_wrap_glFlush(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFogf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFogf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"if:glFogf",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"if:glFogf",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2599,14 +2713,15 @@ static PyObject *_wrap_glFogf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFogfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFogfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glFogfv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glFogfv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2625,13 +2740,14 @@ static PyObject *_wrap_glFogfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFogi(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFogi(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glFogi",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glFogi",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2643,14 +2759,15 @@ static PyObject *_wrap_glFogi(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFogiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFogiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glFogiv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glFogiv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2669,12 +2786,13 @@ static PyObject *_wrap_glFogiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFrontFace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFrontFace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glFrontFace",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glFrontFace",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2686,7 +2804,7 @@ static PyObject *_wrap_glFrontFace(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glFrustum(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glFrustum(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
@@ -2694,9 +2812,10 @@ static PyObject *_wrap_glFrustum(PyObject *self, PyObject *args) {
     GLdouble  _arg3;
     GLdouble  _arg4;
     GLdouble  _arg5;
+    char *_kwnames[] = { "left","right","bottom","top","zNear","zFar", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddddd:glFrustum",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddddd:glFrustum",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2708,13 +2827,14 @@ static PyObject *_wrap_glFrustum(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGenLists(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGenLists(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _result;
     GLsizei  _arg0;
+    char *_kwnames[] = { "range", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glGenLists",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glGenLists",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2725,14 +2845,15 @@ static PyObject *_wrap_glGenLists(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGenTextures(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGenTextures(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "n","textures", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGenTextures",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGenTextures",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2751,14 +2872,15 @@ static PyObject *_wrap_glGenTextures(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetBooleanv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetBooleanv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLboolean * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetBooleanv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetBooleanv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2777,14 +2899,15 @@ static PyObject *_wrap_glGetBooleanv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetClipPlane(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetClipPlane(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "plane","equation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetClipPlane",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetClipPlane",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2803,14 +2926,15 @@ static PyObject *_wrap_glGetClipPlane(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetDoublev(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetDoublev(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetDoublev",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetDoublev",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2829,12 +2953,13 @@ static PyObject *_wrap_glGetDoublev(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetError(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetError(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glGetError")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glGetError",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2845,14 +2970,15 @@ static PyObject *_wrap_glGetError(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetFloatv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetFloatv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetFloatv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetFloatv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2871,14 +2997,15 @@ static PyObject *_wrap_glGetFloatv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetIntegerv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetIntegerv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetIntegerv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetIntegerv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -2897,15 +3024,16 @@ static PyObject *_wrap_glGetIntegerv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetLightfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetLightfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "light","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetLightfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetLightfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -2924,15 +3052,16 @@ static PyObject *_wrap_glGetLightfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetLightiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetLightiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "light","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetLightiv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetLightiv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -2951,15 +3080,16 @@ static PyObject *_wrap_glGetLightiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetMapdv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetMapdv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","query","v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetMapdv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetMapdv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -2978,15 +3108,16 @@ static PyObject *_wrap_glGetMapdv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetMapfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetMapfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","query","v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetMapfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetMapfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3005,15 +3136,16 @@ static PyObject *_wrap_glGetMapfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetMapiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetMapiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","query","v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetMapiv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetMapiv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3032,15 +3164,16 @@ static PyObject *_wrap_glGetMapiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetMaterialfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetMaterialfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "face","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetMaterialfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetMaterialfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3059,15 +3192,16 @@ static PyObject *_wrap_glGetMaterialfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetMaterialiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetMaterialiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "face","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetMaterialiv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetMaterialiv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3086,14 +3220,15 @@ static PyObject *_wrap_glGetMaterialiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetPixelMapfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetPixelMapfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "map","values", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetPixelMapfv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetPixelMapfv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -3112,14 +3247,15 @@ static PyObject *_wrap_glGetPixelMapfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetPixelMapuiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetPixelMapuiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLuint * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "map","values", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetPixelMapuiv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetPixelMapuiv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -3138,14 +3274,15 @@ static PyObject *_wrap_glGetPixelMapuiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetPixelMapusv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetPixelMapusv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLushort * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "map","values", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetPixelMapusv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetPixelMapusv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -3164,14 +3301,15 @@ static PyObject *_wrap_glGetPixelMapusv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetPointerv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetPointerv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLvoid ** _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glGetPointerv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glGetPointerv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -3190,13 +3328,14 @@ static PyObject *_wrap_glGetPointerv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetPolygonStipple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetPolygonStipple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glGetPolygonStipple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glGetPolygonStipple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3215,14 +3354,15 @@ static PyObject *_wrap_glGetPolygonStipple(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte * _result;
     GLenum  _arg0;
+    char *_kwnames[] = { "name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glGetString",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glGetString",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3239,15 +3379,16 @@ static PyObject *_wrap_glGetString(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexEnvfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexEnvfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetTexEnvfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetTexEnvfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3266,15 +3407,16 @@ static PyObject *_wrap_glGetTexEnvfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexEnviv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexEnviv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetTexEnviv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetTexEnviv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3293,15 +3435,16 @@ static PyObject *_wrap_glGetTexEnviv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexGendv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexGendv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "coord","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetTexGendv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetTexGendv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3320,15 +3463,16 @@ static PyObject *_wrap_glGetTexGendv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexGenfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexGenfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "coord","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetTexGenfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetTexGenfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3347,15 +3491,16 @@ static PyObject *_wrap_glGetTexGenfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexGeniv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexGeniv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "coord","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetTexGeniv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetTexGeniv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3374,7 +3519,7 @@ static PyObject *_wrap_glGetTexGeniv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -3382,9 +3527,10 @@ static PyObject *_wrap_glGetTexImage(PyObject *self, PyObject *args) {
     GLenum  _arg3;
     GLvoid * _arg4;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "target","level","format","type","pixels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiO:glGetTexImage",&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiO:glGetTexImage",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo4) {
         if (_argo4 == Py_None) { _arg4 = NULL; }
@@ -3403,16 +3549,17 @@ static PyObject *_wrap_glGetTexImage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexLevelParameterfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexLevelParameterfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
     GLenum  _arg2;
     GLfloat * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "target","level","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glGetTexLevelParameterfv",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glGetTexLevelParameterfv",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -3431,16 +3578,17 @@ static PyObject *_wrap_glGetTexLevelParameterfv(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexLevelParameteriv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexLevelParameteriv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
     GLenum  _arg2;
     GLint * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "target","level","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glGetTexLevelParameteriv",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glGetTexLevelParameteriv",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -3459,15 +3607,16 @@ static PyObject *_wrap_glGetTexLevelParameteriv(PyObject *self, PyObject *args)
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexParameterfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexParameterfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetTexParameterfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetTexParameterfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3486,15 +3635,16 @@ static PyObject *_wrap_glGetTexParameterfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glGetTexParameteriv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glGetTexParameteriv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glGetTexParameteriv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glGetTexParameteriv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3513,13 +3663,14 @@ static PyObject *_wrap_glGetTexParameteriv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glHint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glHint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
+    char *_kwnames[] = { "target","mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glHint",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glHint",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3531,12 +3682,13 @@ static PyObject *_wrap_glHint(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexMask(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
+    char *_kwnames[] = { "mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glIndexMask",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glIndexMask",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3548,15 +3700,16 @@ static PyObject *_wrap_glIndexMask(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "type","stride","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glIndexPointer",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glIndexPointer",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3575,12 +3728,13 @@ static PyObject *_wrap_glIndexPointer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"d:glIndexd",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"d:glIndexd",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3592,13 +3746,14 @@ static PyObject *_wrap_glIndexd(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexdv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexdv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glIndexdv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glIndexdv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3617,12 +3772,13 @@ static PyObject *_wrap_glIndexdv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"f:glIndexf",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"f:glIndexf",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3634,13 +3790,14 @@ static PyObject *_wrap_glIndexf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glIndexfv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glIndexfv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3659,12 +3816,13 @@ static PyObject *_wrap_glIndexfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexi(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexi(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glIndexi",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glIndexi",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3676,13 +3834,14 @@ static PyObject *_wrap_glIndexi(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glIndexiv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glIndexiv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3701,12 +3860,13 @@ static PyObject *_wrap_glIndexiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexs(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexs(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"h:glIndexs",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"h:glIndexs",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3718,13 +3878,14 @@ static PyObject *_wrap_glIndexs(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexsv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexsv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glIndexsv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glIndexsv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3743,12 +3904,13 @@ static PyObject *_wrap_glIndexsv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexub(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexub(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte  _arg0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"b:glIndexub",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"b:glIndexub",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3760,13 +3922,14 @@ static PyObject *_wrap_glIndexub(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIndexubv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIndexubv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "c", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glIndexubv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glIndexubv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3785,11 +3948,12 @@ static PyObject *_wrap_glIndexubv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glInitNames(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glInitNames(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glInitNames")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glInitNames",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3801,15 +3965,16 @@ static PyObject *_wrap_glInitNames(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glInterleavedArrays(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glInterleavedArrays(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "format","stride","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glInterleavedArrays",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glInterleavedArrays",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -3828,13 +3993,14 @@ static PyObject *_wrap_glInterleavedArrays(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIsEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean  _result;
     GLenum  _arg0;
+    char *_kwnames[] = { "cap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glIsEnabled",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glIsEnabled",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3845,13 +4011,14 @@ static PyObject *_wrap_glIsEnabled(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIsList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIsList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean  _result;
     GLuint  _arg0;
+    char *_kwnames[] = { "list", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glIsList",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glIsList",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3862,13 +4029,14 @@ static PyObject *_wrap_glIsList(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glIsTexture(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glIsTexture(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLboolean  _result;
     GLuint  _arg0;
+    char *_kwnames[] = { "texture", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glIsTexture",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glIsTexture",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3879,13 +4047,14 @@ static PyObject *_wrap_glIsTexture(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLightModelf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLightModelf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"if:glLightModelf",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"if:glLightModelf",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3897,14 +4066,15 @@ static PyObject *_wrap_glLightModelf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLightModelfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLightModelfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glLightModelfv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glLightModelfv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -3923,13 +4093,14 @@ static PyObject *_wrap_glLightModelfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLightModeli(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLightModeli(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glLightModeli",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glLightModeli",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3941,14 +4112,15 @@ static PyObject *_wrap_glLightModeli(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLightModeliv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLightModeliv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glLightModeliv",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glLightModeliv",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -3967,14 +4139,15 @@ static PyObject *_wrap_glLightModeliv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLightf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLightf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "light","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iif:glLightf",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iif:glLightf",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3986,15 +4159,16 @@ static PyObject *_wrap_glLightf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLightfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLightfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "light","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glLightfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glLightfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4013,14 +4187,15 @@ static PyObject *_wrap_glLightfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLighti(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLighti(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "light","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glLighti",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glLighti",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4032,15 +4207,16 @@ static PyObject *_wrap_glLighti(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLightiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLightiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "light","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glLightiv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glLightiv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4059,13 +4235,14 @@ static PyObject *_wrap_glLightiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLineStipple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLineStipple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLushort  _arg1;
+    char *_kwnames[] = { "factor","pattern", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ih:glLineStipple",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ih:glLineStipple",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4077,12 +4254,13 @@ static PyObject *_wrap_glLineStipple(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLineWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLineWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
+    char *_kwnames[] = { "width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"f:glLineWidth",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"f:glLineWidth",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4094,12 +4272,13 @@ static PyObject *_wrap_glLineWidth(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glListBase(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glListBase(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
+    char *_kwnames[] = { "base", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glListBase",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glListBase",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4111,11 +4290,12 @@ static PyObject *_wrap_glListBase(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLoadIdentity(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLoadIdentity(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glLoadIdentity")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glLoadIdentity",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4127,13 +4307,14 @@ static PyObject *_wrap_glLoadIdentity(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLoadMatrixd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLoadMatrixd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "m", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glLoadMatrixd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glLoadMatrixd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4152,13 +4333,14 @@ static PyObject *_wrap_glLoadMatrixd(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLoadMatrixf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLoadMatrixf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "m", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glLoadMatrixf",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glLoadMatrixf",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4177,12 +4359,13 @@ static PyObject *_wrap_glLoadMatrixf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLoadName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLoadName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
+    char *_kwnames[] = { "name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glLoadName",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glLoadName",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4194,12 +4377,13 @@ static PyObject *_wrap_glLoadName(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glLogicOp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glLogicOp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "opcode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glLogicOp",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glLogicOp",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4211,7 +4395,7 @@ static PyObject *_wrap_glLogicOp(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMap1d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMap1d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble  _arg1;
@@ -4220,9 +4404,10 @@ static PyObject *_wrap_glMap1d(PyObject *self, PyObject *args) {
     GLint  _arg4;
     GLdouble * _arg5;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "target","u1","u2","stride","order","points", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iddiiO:glMap1d",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iddiiO:glMap1d",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
         return NULL;
     if (_argo5) {
         if (_argo5 == Py_None) { _arg5 = NULL; }
@@ -4241,7 +4426,7 @@ static PyObject *_wrap_glMap1d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMap1f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMap1f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat  _arg1;
@@ -4250,9 +4435,10 @@ static PyObject *_wrap_glMap1f(PyObject *self, PyObject *args) {
     GLint  _arg4;
     GLfloat * _arg5;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "target","u1","u2","stride","order","points", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iffiiO:glMap1f",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iffiiO:glMap1f",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
         return NULL;
     if (_argo5) {
         if (_argo5 == Py_None) { _arg5 = NULL; }
@@ -4271,7 +4457,7 @@ static PyObject *_wrap_glMap1f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMap2d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMap2d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLdouble  _arg1;
@@ -4284,9 +4470,10 @@ static PyObject *_wrap_glMap2d(PyObject *self, PyObject *args) {
     GLint  _arg8;
     GLdouble * _arg9;
     PyObject * _argo9 = 0;
+    char *_kwnames[] = { "target","u1","u2","ustride","uorder","v1","v2","vstride","vorder","points", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iddiiddiiO:glMap2d",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argo9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iddiiddiiO:glMap2d",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argo9)) 
         return NULL;
     if (_argo9) {
         if (_argo9 == Py_None) { _arg9 = NULL; }
@@ -4305,7 +4492,7 @@ static PyObject *_wrap_glMap2d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMap2f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMap2f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat  _arg1;
@@ -4318,9 +4505,10 @@ static PyObject *_wrap_glMap2f(PyObject *self, PyObject *args) {
     GLint  _arg8;
     GLfloat * _arg9;
     PyObject * _argo9 = 0;
+    char *_kwnames[] = { "target","u1","u2","ustride","uorder","v1","v2","vstride","vorder","points", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iffiiffiiO:glMap2f",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argo9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iffiiffiiO:glMap2f",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_arg8,&_argo9)) 
         return NULL;
     if (_argo9) {
         if (_argo9 == Py_None) { _arg9 = NULL; }
@@ -4339,14 +4527,15 @@ static PyObject *_wrap_glMap2f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMapGrid1d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMapGrid1d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "un","u1","u2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"idd:glMapGrid1d",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"idd:glMapGrid1d",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4358,14 +4547,15 @@ static PyObject *_wrap_glMapGrid1d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMapGrid1f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMapGrid1f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "un","u1","u2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iff:glMapGrid1f",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iff:glMapGrid1f",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4377,7 +4567,7 @@ static PyObject *_wrap_glMapGrid1f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMapGrid2d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMapGrid2d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLdouble  _arg1;
@@ -4385,9 +4575,10 @@ static PyObject *_wrap_glMapGrid2d(PyObject *self, PyObject *args) {
     GLint  _arg3;
     GLdouble  _arg4;
     GLdouble  _arg5;
+    char *_kwnames[] = { "un","u1","u2","vn","v1","v2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iddidd:glMapGrid2d",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iddidd:glMapGrid2d",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4399,7 +4590,7 @@ static PyObject *_wrap_glMapGrid2d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMapGrid2f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMapGrid2f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLfloat  _arg1;
@@ -4407,9 +4598,10 @@ static PyObject *_wrap_glMapGrid2f(PyObject *self, PyObject *args) {
     GLint  _arg3;
     GLfloat  _arg4;
     GLfloat  _arg5;
+    char *_kwnames[] = { "un","u1","u2","vn","v1","v2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iffiff:glMapGrid2f",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iffiff:glMapGrid2f",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4421,14 +4613,15 @@ static PyObject *_wrap_glMapGrid2f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMaterialf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMaterialf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "face","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iif:glMaterialf",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iif:glMaterialf",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4440,15 +4633,16 @@ static PyObject *_wrap_glMaterialf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMaterialfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMaterialfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "face","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glMaterialfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glMaterialfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4467,14 +4661,15 @@ static PyObject *_wrap_glMaterialfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMateriali(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMateriali(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "face","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glMateriali",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glMateriali",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4486,15 +4681,16 @@ static PyObject *_wrap_glMateriali(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMaterialiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMaterialiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "face","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glMaterialiv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glMaterialiv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4513,12 +4709,13 @@ static PyObject *_wrap_glMaterialiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMatrixMode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMatrixMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glMatrixMode",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glMatrixMode",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4530,13 +4727,14 @@ static PyObject *_wrap_glMatrixMode(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMultMatrixd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMultMatrixd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "m", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glMultMatrixd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glMultMatrixd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4555,13 +4753,14 @@ static PyObject *_wrap_glMultMatrixd(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glMultMatrixf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glMultMatrixf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "m", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glMultMatrixf",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glMultMatrixf",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4580,13 +4779,14 @@ static PyObject *_wrap_glMultMatrixf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNewList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNewList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
     GLenum  _arg1;
+    char *_kwnames[] = { "list","mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glNewList",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glNewList",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4598,14 +4798,15 @@ static PyObject *_wrap_glNewList(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3b(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3b(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbyte  _arg0;
     GLbyte  _arg1;
     GLbyte  _arg2;
+    char *_kwnames[] = { "nx","ny","nz", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"bbb:glNormal3b",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"bbb:glNormal3b",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4617,13 +4818,14 @@ static PyObject *_wrap_glNormal3b(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3bv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3bv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glNormal3bv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glNormal3bv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4642,14 +4844,15 @@ static PyObject *_wrap_glNormal3bv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "nx","ny","nz", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ddd:glNormal3d",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ddd:glNormal3d",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4661,13 +4864,14 @@ static PyObject *_wrap_glNormal3d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glNormal3dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glNormal3dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4686,14 +4890,15 @@ static PyObject *_wrap_glNormal3dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "nx","ny","nz", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"fff:glNormal3f",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"fff:glNormal3f",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4705,13 +4910,14 @@ static PyObject *_wrap_glNormal3f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glNormal3fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glNormal3fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4730,14 +4936,15 @@ static PyObject *_wrap_glNormal3fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "nx","ny","nz", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glNormal3i",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glNormal3i",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4749,13 +4956,14 @@ static PyObject *_wrap_glNormal3i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glNormal3iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glNormal3iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4774,14 +4982,15 @@ static PyObject *_wrap_glNormal3iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
+    char *_kwnames[] = { "nx","ny","nz", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhh:glNormal3s",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhh:glNormal3s",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4793,13 +5002,14 @@ static PyObject *_wrap_glNormal3s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormal3sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormal3sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glNormal3sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glNormal3sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4818,15 +5028,16 @@ static PyObject *_wrap_glNormal3sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glNormalPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glNormalPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLvoid * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "type","stride","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glNormalPointer",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glNormalPointer",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4845,7 +5056,7 @@ static PyObject *_wrap_glNormalPointer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glOrtho(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glOrtho(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
@@ -4853,9 +5064,10 @@ static PyObject *_wrap_glOrtho(PyObject *self, PyObject *args) {
     GLdouble  _arg3;
     GLdouble  _arg4;
     GLdouble  _arg5;
+    char *_kwnames[] = { "left","right","bottom","top","zNear","zFar", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddddd:glOrtho",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddddd:glOrtho",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4867,12 +5079,13 @@ static PyObject *_wrap_glOrtho(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPassThrough(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPassThrough(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
+    char *_kwnames[] = { "token", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"f:glPassThrough",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"f:glPassThrough",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4884,15 +5097,16 @@ static PyObject *_wrap_glPassThrough(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelMapfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelMapfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "map","mapsize","values", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glPixelMapfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glPixelMapfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4911,15 +5125,16 @@ static PyObject *_wrap_glPixelMapfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelMapuiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelMapuiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLuint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "map","mapsize","values", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glPixelMapuiv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glPixelMapuiv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4938,15 +5153,16 @@ static PyObject *_wrap_glPixelMapuiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelMapusv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelMapusv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLsizei  _arg1;
     GLushort * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "map","mapsize","values", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glPixelMapusv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glPixelMapusv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -4965,13 +5181,14 @@ static PyObject *_wrap_glPixelMapusv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelStoref(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelStoref(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"if:glPixelStoref",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"if:glPixelStoref",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4983,13 +5200,14 @@ static PyObject *_wrap_glPixelStoref(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelStorei(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelStorei(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glPixelStorei",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glPixelStorei",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5001,13 +5219,14 @@ static PyObject *_wrap_glPixelStorei(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelTransferf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelTransferf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"if:glPixelTransferf",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"if:glPixelTransferf",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5019,13 +5238,14 @@ static PyObject *_wrap_glPixelTransferf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelTransferi(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelTransferi(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glPixelTransferi",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glPixelTransferi",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5037,13 +5257,14 @@ static PyObject *_wrap_glPixelTransferi(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPixelZoom(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPixelZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "xfactor","yfactor", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ff:glPixelZoom",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ff:glPixelZoom",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5055,12 +5276,13 @@ static PyObject *_wrap_glPixelZoom(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPointSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPointSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
+    char *_kwnames[] = { "size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"f:glPointSize",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"f:glPointSize",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5072,13 +5294,14 @@ static PyObject *_wrap_glPointSize(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPolygonMode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPolygonMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
+    char *_kwnames[] = { "face","mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glPolygonMode",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glPolygonMode",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5090,13 +5313,14 @@ static PyObject *_wrap_glPolygonMode(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPolygonOffset(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPolygonOffset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "factor","units", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ff:glPolygonOffset",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ff:glPolygonOffset",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5108,13 +5332,14 @@ static PyObject *_wrap_glPolygonOffset(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPolygonStipple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPolygonStipple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLubyte * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glPolygonStipple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glPolygonStipple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5133,11 +5358,12 @@ static PyObject *_wrap_glPolygonStipple(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPopAttrib(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPopAttrib(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glPopAttrib")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glPopAttrib",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5149,11 +5375,12 @@ static PyObject *_wrap_glPopAttrib(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPopClientAttrib(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPopClientAttrib(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glPopClientAttrib")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glPopClientAttrib",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5165,11 +5392,12 @@ static PyObject *_wrap_glPopClientAttrib(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPopMatrix(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPopMatrix(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glPopMatrix")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glPopMatrix",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5181,11 +5409,12 @@ static PyObject *_wrap_glPopMatrix(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPopName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPopName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glPopName")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glPopName",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5197,16 +5426,17 @@ static PyObject *_wrap_glPopName(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPrioritizeTextures(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPrioritizeTextures(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;
     GLclampf * _arg2;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "n","textures","priorities", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iOO:glPrioritizeTextures",&_arg0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iOO:glPrioritizeTextures",_kwnames,&_arg0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -5232,12 +5462,13 @@ static PyObject *_wrap_glPrioritizeTextures(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPushAttrib(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPushAttrib(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbitfield  _arg0;
+    char *_kwnames[] = { "mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glPushAttrib",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glPushAttrib",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5249,12 +5480,13 @@ static PyObject *_wrap_glPushAttrib(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPushClientAttrib(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPushClientAttrib(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLbitfield  _arg0;
+    char *_kwnames[] = { "mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glPushClientAttrib",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glPushClientAttrib",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5266,11 +5498,12 @@ static PyObject *_wrap_glPushClientAttrib(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPushMatrix(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPushMatrix(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":glPushMatrix")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":glPushMatrix",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5282,12 +5515,13 @@ static PyObject *_wrap_glPushMatrix(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glPushName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glPushName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
+    char *_kwnames[] = { "name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glPushName",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glPushName",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5299,13 +5533,14 @@ static PyObject *_wrap_glPushName(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dd:glRasterPos2d",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dd:glRasterPos2d",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5317,13 +5552,14 @@ static PyObject *_wrap_glRasterPos2d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos2dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos2dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5342,13 +5578,14 @@ static PyObject *_wrap_glRasterPos2dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ff:glRasterPos2f",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ff:glRasterPos2f",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5360,13 +5597,14 @@ static PyObject *_wrap_glRasterPos2f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos2fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos2fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5385,13 +5623,14 @@ static PyObject *_wrap_glRasterPos2fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glRasterPos2i",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glRasterPos2i",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5403,13 +5642,14 @@ static PyObject *_wrap_glRasterPos2i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos2iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos2iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5428,13 +5668,14 @@ static PyObject *_wrap_glRasterPos2iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hh:glRasterPos2s",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hh:glRasterPos2s",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5446,13 +5687,14 @@ static PyObject *_wrap_glRasterPos2s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos2sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos2sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos2sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos2sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5471,14 +5713,15 @@ static PyObject *_wrap_glRasterPos2sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ddd:glRasterPos3d",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ddd:glRasterPos3d",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5490,13 +5733,14 @@ static PyObject *_wrap_glRasterPos3d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos3dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos3dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5515,14 +5759,15 @@ static PyObject *_wrap_glRasterPos3dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"fff:glRasterPos3f",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"fff:glRasterPos3f",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5534,13 +5779,14 @@ static PyObject *_wrap_glRasterPos3f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos3fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos3fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5559,14 +5805,15 @@ static PyObject *_wrap_glRasterPos3fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glRasterPos3i",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glRasterPos3i",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5578,13 +5825,14 @@ static PyObject *_wrap_glRasterPos3i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos3iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos3iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5603,14 +5851,15 @@ static PyObject *_wrap_glRasterPos3iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhh:glRasterPos3s",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhh:glRasterPos3s",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5622,13 +5871,14 @@ static PyObject *_wrap_glRasterPos3s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos3sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos3sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos3sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos3sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5647,15 +5897,16 @@ static PyObject *_wrap_glRasterPos3sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
     GLdouble  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddd:glRasterPos4d",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddd:glRasterPos4d",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5667,13 +5918,14 @@ static PyObject *_wrap_glRasterPos4d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos4dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos4dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5692,15 +5944,16 @@ static PyObject *_wrap_glRasterPos4dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
     GLfloat  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glRasterPos4f",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glRasterPos4f",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5712,13 +5965,14 @@ static PyObject *_wrap_glRasterPos4f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos4fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos4fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5737,15 +5991,16 @@ static PyObject *_wrap_glRasterPos4fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
     GLint  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glRasterPos4i",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glRasterPos4i",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5757,13 +6012,14 @@ static PyObject *_wrap_glRasterPos4i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos4iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos4iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5782,15 +6038,16 @@ static PyObject *_wrap_glRasterPos4iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
     GLshort  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhhh:glRasterPos4s",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhhh:glRasterPos4s",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5802,13 +6059,14 @@ static PyObject *_wrap_glRasterPos4s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRasterPos4sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRasterPos4sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glRasterPos4sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glRasterPos4sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5827,12 +6085,13 @@ static PyObject *_wrap_glRasterPos4sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glReadBuffer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glReadBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glReadBuffer",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glReadBuffer",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5844,7 +6103,7 @@ static PyObject *_wrap_glReadBuffer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glReadPixels(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glReadPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
@@ -5854,9 +6113,10 @@ static PyObject *_wrap_glReadPixels(PyObject *self, PyObject *args) {
     GLenum  _arg5;
     GLvoid * _arg6;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "x","y","width","height","format","type","pixels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiiO:glReadPixels",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiiO:glReadPixels",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
         return NULL;
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
@@ -5875,15 +6135,16 @@ static PyObject *_wrap_glReadPixels(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRectd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRectd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
     GLdouble  _arg3;
+    char *_kwnames[] = { "x1","y1","x2","y2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddd:glRectd",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddd:glRectd",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5895,15 +6156,16 @@ static PyObject *_wrap_glRectd(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRectdv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRectdv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     GLdouble * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "v1","v2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:glRectdv",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:glRectdv",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5929,15 +6191,16 @@ static PyObject *_wrap_glRectdv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRectf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRectf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
     GLfloat  _arg3;
+    char *_kwnames[] = { "x1","y1","x2","y2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glRectf",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glRectf",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5949,15 +6212,16 @@ static PyObject *_wrap_glRectf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRectfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRectfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     GLfloat * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "v1","v2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:glRectfv",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:glRectfv",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5983,15 +6247,16 @@ static PyObject *_wrap_glRectfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRecti(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRecti(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
     GLint  _arg3;
+    char *_kwnames[] = { "x1","y1","x2","y2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glRecti",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glRecti",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6003,15 +6268,16 @@ static PyObject *_wrap_glRecti(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRectiv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRectiv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     GLint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "v1","v2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:glRectiv",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:glRectiv",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6037,15 +6303,16 @@ static PyObject *_wrap_glRectiv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRects(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
     GLshort  _arg3;
+    char *_kwnames[] = { "x1","y1","x2","y2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhhh:glRects",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhhh:glRects",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6057,15 +6324,16 @@ static PyObject *_wrap_glRects(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRectsv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRectsv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     GLshort * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "v1","v2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:glRectsv",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:glRectsv",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6091,13 +6359,14 @@ static PyObject *_wrap_glRectsv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRenderMode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRenderMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _result;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glRenderMode",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glRenderMode",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6108,15 +6377,16 @@ static PyObject *_wrap_glRenderMode(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRotated(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRotated(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
     GLdouble  _arg3;
+    char *_kwnames[] = { "angle","x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddd:glRotated",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddd:glRotated",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6128,15 +6398,16 @@ static PyObject *_wrap_glRotated(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glRotatef(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glRotatef(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
     GLfloat  _arg3;
+    char *_kwnames[] = { "angle","x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glRotatef",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glRotatef",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6148,14 +6419,15 @@ static PyObject *_wrap_glRotatef(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glScaled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glScaled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ddd:glScaled",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ddd:glScaled",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6167,14 +6439,15 @@ static PyObject *_wrap_glScaled(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glScalef(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glScalef(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"fff:glScalef",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"fff:glScalef",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6186,15 +6459,16 @@ static PyObject *_wrap_glScalef(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glScissor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glScissor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLsizei  _arg2;
     GLsizei  _arg3;
+    char *_kwnames[] = { "x","y","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glScissor",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glScissor",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6206,14 +6480,15 @@ static PyObject *_wrap_glScissor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glSelectBuffer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glSelectBuffer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLsizei  _arg0;
     GLuint * _arg1;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "size","buffer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO:glSelectBuffer",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO:glSelectBuffer",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -6232,12 +6507,13 @@ static PyObject *_wrap_glSelectBuffer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glShadeModel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glShadeModel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
+    char *_kwnames[] = { "mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glShadeModel",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glShadeModel",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6249,14 +6525,15 @@ static PyObject *_wrap_glShadeModel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glStencilFunc(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glStencilFunc(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
     GLuint  _arg2;
+    char *_kwnames[] = { "func","ref","mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glStencilFunc",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glStencilFunc",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6268,12 +6545,13 @@ static PyObject *_wrap_glStencilFunc(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glStencilMask(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glStencilMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLuint  _arg0;
+    char *_kwnames[] = { "mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glStencilMask",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glStencilMask",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6285,14 +6563,15 @@ static PyObject *_wrap_glStencilMask(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glStencilOp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glStencilOp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLenum  _arg2;
+    char *_kwnames[] = { "fail","zfail","zpass", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glStencilOp",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glStencilOp",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6304,12 +6583,13 @@ static PyObject *_wrap_glStencilOp(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
+    char *_kwnames[] = { "s", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"d:glTexCoord1d",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"d:glTexCoord1d",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6321,13 +6601,14 @@ static PyObject *_wrap_glTexCoord1d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord1dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord1dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6346,12 +6627,13 @@ static PyObject *_wrap_glTexCoord1dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
+    char *_kwnames[] = { "s", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"f:glTexCoord1f",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"f:glTexCoord1f",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6363,13 +6645,14 @@ static PyObject *_wrap_glTexCoord1f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord1fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord1fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6388,12 +6671,13 @@ static PyObject *_wrap_glTexCoord1fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
+    char *_kwnames[] = { "s", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:glTexCoord1i",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:glTexCoord1i",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6405,13 +6689,14 @@ static PyObject *_wrap_glTexCoord1i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord1iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord1iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6430,12 +6715,13 @@ static PyObject *_wrap_glTexCoord1iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
+    char *_kwnames[] = { "s", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"h:glTexCoord1s",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"h:glTexCoord1s",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6447,13 +6733,14 @@ static PyObject *_wrap_glTexCoord1s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord1sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord1sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord1sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord1sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6472,13 +6759,14 @@ static PyObject *_wrap_glTexCoord1sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
+    char *_kwnames[] = { "s","t", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dd:glTexCoord2d",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dd:glTexCoord2d",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6490,13 +6778,14 @@ static PyObject *_wrap_glTexCoord2d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord2dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord2dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6515,13 +6804,14 @@ static PyObject *_wrap_glTexCoord2dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "s","t", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ff:glTexCoord2f",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ff:glTexCoord2f",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6533,13 +6823,14 @@ static PyObject *_wrap_glTexCoord2f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord2fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord2fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6558,13 +6849,14 @@ static PyObject *_wrap_glTexCoord2fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "s","t", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glTexCoord2i",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glTexCoord2i",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6576,13 +6868,14 @@ static PyObject *_wrap_glTexCoord2i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord2iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord2iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6601,13 +6894,14 @@ static PyObject *_wrap_glTexCoord2iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
+    char *_kwnames[] = { "s","t", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hh:glTexCoord2s",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hh:glTexCoord2s",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6619,13 +6913,14 @@ static PyObject *_wrap_glTexCoord2s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord2sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord2sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord2sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord2sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6644,14 +6939,15 @@ static PyObject *_wrap_glTexCoord2sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "s","t","r", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ddd:glTexCoord3d",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ddd:glTexCoord3d",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6663,13 +6959,14 @@ static PyObject *_wrap_glTexCoord3d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord3dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord3dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6688,14 +6985,15 @@ static PyObject *_wrap_glTexCoord3dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "s","t","r", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"fff:glTexCoord3f",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"fff:glTexCoord3f",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6707,13 +7005,14 @@ static PyObject *_wrap_glTexCoord3f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord3fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord3fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6732,14 +7031,15 @@ static PyObject *_wrap_glTexCoord3fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "s","t","r", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glTexCoord3i",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glTexCoord3i",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6751,13 +7051,14 @@ static PyObject *_wrap_glTexCoord3i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord3iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord3iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6776,14 +7077,15 @@ static PyObject *_wrap_glTexCoord3iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
+    char *_kwnames[] = { "s","t","r", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhh:glTexCoord3s",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhh:glTexCoord3s",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6795,13 +7097,14 @@ static PyObject *_wrap_glTexCoord3s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord3sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord3sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord3sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord3sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6820,15 +7123,16 @@ static PyObject *_wrap_glTexCoord3sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
     GLdouble  _arg3;
+    char *_kwnames[] = { "s","t","r","q", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddd:glTexCoord4d",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddd:glTexCoord4d",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6840,13 +7144,14 @@ static PyObject *_wrap_glTexCoord4d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord4dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord4dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6865,15 +7170,16 @@ static PyObject *_wrap_glTexCoord4dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
     GLfloat  _arg3;
+    char *_kwnames[] = { "s","t","r","q", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glTexCoord4f",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glTexCoord4f",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6885,13 +7191,14 @@ static PyObject *_wrap_glTexCoord4f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord4fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord4fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6910,15 +7217,16 @@ static PyObject *_wrap_glTexCoord4fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
     GLint  _arg3;
+    char *_kwnames[] = { "s","t","r","q", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glTexCoord4i",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glTexCoord4i",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6930,13 +7238,14 @@ static PyObject *_wrap_glTexCoord4i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord4iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord4iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6955,15 +7264,16 @@ static PyObject *_wrap_glTexCoord4iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
     GLshort  _arg3;
+    char *_kwnames[] = { "s","t","r","q", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhhh:glTexCoord4s",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhhh:glTexCoord4s",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -6975,13 +7285,14 @@ static PyObject *_wrap_glTexCoord4s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoord4sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoord4sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glTexCoord4sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glTexCoord4sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7000,16 +7311,17 @@ static PyObject *_wrap_glTexCoord4sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexCoordPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexCoordPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "size","type","stride","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glTexCoordPointer",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glTexCoordPointer",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -7028,14 +7340,15 @@ static PyObject *_wrap_glTexCoordPointer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexEnvf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexEnvf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "target","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iif:glTexEnvf",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iif:glTexEnvf",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7047,15 +7360,16 @@ static PyObject *_wrap_glTexEnvf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexEnvfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexEnvfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glTexEnvfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glTexEnvfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7074,14 +7388,15 @@ static PyObject *_wrap_glTexEnvfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexEnvi(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexEnvi(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "target","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glTexEnvi",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glTexEnvi",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7093,15 +7408,16 @@ static PyObject *_wrap_glTexEnvi(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexEnviv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexEnviv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glTexEnviv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glTexEnviv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7120,14 +7436,15 @@ static PyObject *_wrap_glTexEnviv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexGend(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexGend(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "coord","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iid:glTexGend",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iid:glTexGend",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7139,15 +7456,16 @@ static PyObject *_wrap_glTexGend(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexGendv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexGendv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLdouble * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "coord","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glTexGendv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glTexGendv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7166,14 +7484,15 @@ static PyObject *_wrap_glTexGendv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexGenf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexGenf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "coord","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iif:glTexGenf",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iif:glTexGenf",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7185,15 +7504,16 @@ static PyObject *_wrap_glTexGenf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexGenfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexGenfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "coord","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glTexGenfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glTexGenfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7212,14 +7532,15 @@ static PyObject *_wrap_glTexGenfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexGeni(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexGeni(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "coord","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glTexGeni",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glTexGeni",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7231,15 +7552,16 @@ static PyObject *_wrap_glTexGeni(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexGeniv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexGeniv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "coord","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glTexGeniv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glTexGeniv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7258,7 +7580,7 @@ static PyObject *_wrap_glTexGeniv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexImage1D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexImage1D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -7269,9 +7591,10 @@ static PyObject *_wrap_glTexImage1D(PyObject *self, PyObject *args) {
     GLenum  _arg6;
     GLvoid * _arg7;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "target","level","internalformat","width","border","format","type","pixels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiiiO:glTexImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_argo7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiiiO:glTexImage1D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_argo7)) 
         return NULL;
     if (_argo7) {
         if (_argo7 == Py_None) { _arg7 = NULL; }
@@ -7290,7 +7613,7 @@ static PyObject *_wrap_glTexImage1D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexImage2D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexImage2D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -7302,9 +7625,10 @@ static PyObject *_wrap_glTexImage2D(PyObject *self, PyObject *args) {
     GLenum  _arg7;
     GLvoid * _arg8;
     PyObject * _argo8 = 0;
+    char *_kwnames[] = { "target","level","internalformat","width","height","border","format","type","pixels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiiiiO:glTexImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argo8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiiiiO:glTexImage2D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argo8)) 
         return NULL;
     if (_argo8) {
         if (_argo8 == Py_None) { _arg8 = NULL; }
@@ -7323,14 +7647,15 @@ static PyObject *_wrap_glTexImage2D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexParameterf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexParameterf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "target","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iif:glTexParameterf",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iif:glTexParameterf",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7342,15 +7667,16 @@ static PyObject *_wrap_glTexParameterf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexParameterfv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexParameterfv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLfloat * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glTexParameterfv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glTexParameterfv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7369,14 +7695,15 @@ static PyObject *_wrap_glTexParameterfv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexParameteri(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexParameteri(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "target","pname","param", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glTexParameteri",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glTexParameteri",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7388,15 +7715,16 @@ static PyObject *_wrap_glTexParameteri(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexParameteriv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexParameteriv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLenum  _arg1;
     GLint * _arg2;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "target","pname","params", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiO:glTexParameteriv",&_arg0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiO:glTexParameteriv",_kwnames,&_arg0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo2) {
         if (_argo2 == Py_None) { _arg2 = NULL; }
@@ -7415,7 +7743,7 @@ static PyObject *_wrap_glTexParameteriv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexSubImage1D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexSubImage1D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -7425,9 +7753,10 @@ static PyObject *_wrap_glTexSubImage1D(PyObject *self, PyObject *args) {
     GLenum  _arg5;
     GLvoid * _arg6;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "target","level","xoffset","width","format","type","pixels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiiO:glTexSubImage1D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiiO:glTexSubImage1D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
         return NULL;
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
@@ -7446,7 +7775,7 @@ static PyObject *_wrap_glTexSubImage1D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTexSubImage2D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTexSubImage2D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLenum  _arg0;
     GLint  _arg1;
@@ -7458,9 +7787,10 @@ static PyObject *_wrap_glTexSubImage2D(PyObject *self, PyObject *args) {
     GLenum  _arg7;
     GLvoid * _arg8;
     PyObject * _argo8 = 0;
+    char *_kwnames[] = { "target","level","xoffset","yoffset","width","height","format","type","pixels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiiiiiiO:glTexSubImage2D",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argo8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiiiiiiO:glTexSubImage2D",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6,&_arg7,&_argo8)) 
         return NULL;
     if (_argo8) {
         if (_argo8 == Py_None) { _arg8 = NULL; }
@@ -7479,14 +7809,15 @@ static PyObject *_wrap_glTexSubImage2D(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTranslated(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTranslated(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ddd:glTranslated",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ddd:glTranslated",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7498,14 +7829,15 @@ static PyObject *_wrap_glTranslated(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glTranslatef(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glTranslatef(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"fff:glTranslatef",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"fff:glTranslatef",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7517,13 +7849,14 @@ static PyObject *_wrap_glTranslatef(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dd:glVertex2d",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dd:glVertex2d",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7535,13 +7868,14 @@ static PyObject *_wrap_glVertex2d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex2dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex2dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7560,13 +7894,14 @@ static PyObject *_wrap_glVertex2dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ff:glVertex2f",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ff:glVertex2f",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7578,13 +7913,14 @@ static PyObject *_wrap_glVertex2f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex2fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex2fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7603,13 +7939,14 @@ static PyObject *_wrap_glVertex2fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:glVertex2i",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:glVertex2i",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7621,13 +7958,14 @@ static PyObject *_wrap_glVertex2i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex2iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex2iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7646,13 +7984,14 @@ static PyObject *_wrap_glVertex2iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
+    char *_kwnames[] = { "x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hh:glVertex2s",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hh:glVertex2s",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7664,13 +8003,14 @@ static PyObject *_wrap_glVertex2s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex2sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex2sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex2sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex2sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7689,14 +8029,15 @@ static PyObject *_wrap_glVertex2sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ddd:glVertex3d",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ddd:glVertex3d",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7708,13 +8049,14 @@ static PyObject *_wrap_glVertex3d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex3dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex3dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7733,14 +8075,15 @@ static PyObject *_wrap_glVertex3dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"fff:glVertex3f",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"fff:glVertex3f",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7752,13 +8095,14 @@ static PyObject *_wrap_glVertex3f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex3fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex3fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7777,14 +8121,15 @@ static PyObject *_wrap_glVertex3fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iii:glVertex3i",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iii:glVertex3i",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7796,13 +8141,14 @@ static PyObject *_wrap_glVertex3i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex3iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex3iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7821,14 +8167,15 @@ static PyObject *_wrap_glVertex3iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
+    char *_kwnames[] = { "x","y","z", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhh:glVertex3s",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhh:glVertex3s",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7840,13 +8187,14 @@ static PyObject *_wrap_glVertex3s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex3sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex3sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex3sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex3sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7865,15 +8213,16 @@ static PyObject *_wrap_glVertex3sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4d(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4d(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble  _arg0;
     GLdouble  _arg1;
     GLdouble  _arg2;
     GLdouble  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"dddd:glVertex4d",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"dddd:glVertex4d",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7885,13 +8234,14 @@ static PyObject *_wrap_glVertex4d(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4dv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4dv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLdouble * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex4dv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex4dv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7910,15 +8260,16 @@ static PyObject *_wrap_glVertex4dv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4f(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4f(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat  _arg0;
     GLfloat  _arg1;
     GLfloat  _arg2;
     GLfloat  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ffff:glVertex4f",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ffff:glVertex4f",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7930,13 +8281,14 @@ static PyObject *_wrap_glVertex4f(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4fv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4fv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLfloat * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex4fv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex4fv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -7955,15 +8307,16 @@ static PyObject *_wrap_glVertex4fv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4i(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4i(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLint  _arg2;
     GLint  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glVertex4i",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glVertex4i",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -7975,13 +8328,14 @@ static PyObject *_wrap_glVertex4i(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4iv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4iv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex4iv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex4iv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8000,15 +8354,16 @@ static PyObject *_wrap_glVertex4iv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4s(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4s(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort  _arg0;
     GLshort  _arg1;
     GLshort  _arg2;
     GLshort  _arg3;
+    char *_kwnames[] = { "x","y","z","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"hhhh:glVertex4s",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"hhhh:glVertex4s",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -8020,13 +8375,14 @@ static PyObject *_wrap_glVertex4s(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertex4sv(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertex4sv(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLshort * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:glVertex4sv",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:glVertex4sv",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8045,16 +8401,17 @@ static PyObject *_wrap_glVertex4sv(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glVertexPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glVertexPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLenum  _arg1;
     GLsizei  _arg2;
     GLvoid * _arg3;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "size","type","stride","pointer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiiO:glVertexPointer",&_arg0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiiO:glVertexPointer",_kwnames,&_arg0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo3) {
         if (_argo3 == Py_None) { _arg3 = NULL; }
@@ -8073,15 +8430,16 @@ static PyObject *_wrap_glVertexPointer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_glViewport(PyObject *self, PyObject *args) {
+static PyObject *_wrap_glViewport(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     GLint  _arg0;
     GLint  _arg1;
     GLsizei  _arg2;
     GLsizei  _arg3;
+    char *_kwnames[] = { "x","y","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iiii:glViewport",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iiii:glViewport",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -8094,7 +8452,7 @@ static PyObject *_wrap_glViewport(PyObject *self, PyObject *args) {
 }
 
 #define new_wxGLContext(_swigarg0,_swigarg1,_swigarg2) (new wxGLContext(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_new_wxGLContext(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxGLContext(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLContext * _result;
     bool  _arg0;
@@ -8103,10 +8461,11 @@ static PyObject *_wrap_new_wxGLContext(PyObject *self, PyObject *args) {
     int tempbool0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "isRGB","win","palette", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"iO|O:new_wxGLContext",&tempbool0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"iO|O:new_wxGLContext",_kwnames,&tempbool0,&_argo1,&_argo2)) 
         return NULL;
     _arg0 = (bool ) tempbool0;
     if (_argo1) {
@@ -8139,13 +8498,14 @@ static PyObject *_wrap_new_wxGLContext(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxGLContext(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxGLContext(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxGLContext(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxGLContext",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxGLContext",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8165,13 +8525,14 @@ static PyObject *_wrap_delete_wxGLContext(PyObject *self, PyObject *args) {
 }
 
 #define wxGLContext_SetCurrent(_swigobj)  (_swigobj->SetCurrent())
-static PyObject *_wrap_wxGLContext_SetCurrent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLContext_SetCurrent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGLContext_SetCurrent",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGLContext_SetCurrent",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8191,14 +8552,15 @@ static PyObject *_wrap_wxGLContext_SetCurrent(PyObject *self, PyObject *args) {
 }
 
 #define wxGLContext_SetColour(_swigobj,_swigarg0)  (_swigobj->SetColour(_swigarg0))
-static PyObject *_wrap_wxGLContext_SetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLContext_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
     char * _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Os:wxGLContext_SetColour",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os:wxGLContext_SetColour",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8218,13 +8580,14 @@ static PyObject *_wrap_wxGLContext_SetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxGLContext_SwapBuffers(_swigobj)  (_swigobj->SwapBuffers())
-static PyObject *_wrap_wxGLContext_SwapBuffers(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLContext_SwapBuffers(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLContext * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGLContext_SwapBuffers",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGLContext_SwapBuffers",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8244,15 +8607,16 @@ static PyObject *_wrap_wxGLContext_SwapBuffers(PyObject *self, PyObject *args) {
 }
 
 #define wxGLContext_GetWindow(_swigobj)  (_swigobj->GetWindow())
-static PyObject *_wrap_wxGLContext_GetWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLContext_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxGLContext * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGLContext_GetWindow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGLContext_GetWindow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8309,7 +8673,7 @@ static void *SwigwxGLCanvasTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxGLCanvas(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxGLCanvas(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLCanvas * _result;
     wxWindow * _arg0;
@@ -8325,10 +8689,11 @@ static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _argo6 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name","attribList","palette", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iOOlsOO:new_wxGLCanvas",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_argo6,&_argo7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlsOO:new_wxGLCanvas",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_argo6,&_argo7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8381,13 +8746,14 @@ static PyObject *_wrap_new_wxGLCanvas(PyObject *self, PyObject *args) {
 }
 
 #define wxGLCanvas_SetCurrent(_swigobj)  (_swigobj->SetCurrent())
-static PyObject *_wrap_wxGLCanvas_SetCurrent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLCanvas_SetCurrent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGLCanvas_SetCurrent",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGLCanvas_SetCurrent",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8407,14 +8773,15 @@ static PyObject *_wrap_wxGLCanvas_SetCurrent(PyObject *self, PyObject *args) {
 }
 
 #define wxGLCanvas_SetColour(_swigobj,_swigarg0)  (_swigobj->SetColour(_swigarg0))
-static PyObject *_wrap_wxGLCanvas_SetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLCanvas_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;
     char * _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Os:wxGLCanvas_SetColour",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os:wxGLCanvas_SetColour",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8434,13 +8801,14 @@ static PyObject *_wrap_wxGLCanvas_SetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxGLCanvas_SwapBuffers(_swigobj)  (_swigobj->SwapBuffers())
-static PyObject *_wrap_wxGLCanvas_SwapBuffers(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLCanvas_SwapBuffers(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLCanvas * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGLCanvas_SwapBuffers",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGLCanvas_SwapBuffers",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8460,15 +8828,16 @@ static PyObject *_wrap_wxGLCanvas_SwapBuffers(PyObject *self, PyObject *args) {
 }
 
 #define wxGLCanvas_GetContext(_swigobj)  (_swigobj->GetContext())
-static PyObject *_wrap_wxGLCanvas_GetContext(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGLCanvas_GetContext(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGLContext * _result;
     wxGLCanvas * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGLCanvas_GetContext",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGLCanvas_GetContext",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -8493,375 +8862,375 @@ static PyObject *_wrap_wxGLCanvas_GetContext(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef glcanvascMethods[] = {
-	 { "wxGLCanvas_GetContext", _wrap_wxGLCanvas_GetContext, METH_VARARGS },
-	 { "wxGLCanvas_SwapBuffers", _wrap_wxGLCanvas_SwapBuffers, METH_VARARGS },
-	 { "wxGLCanvas_SetColour", _wrap_wxGLCanvas_SetColour, METH_VARARGS },
-	 { "wxGLCanvas_SetCurrent", _wrap_wxGLCanvas_SetCurrent, METH_VARARGS },
-	 { "new_wxGLCanvas", _wrap_new_wxGLCanvas, METH_VARARGS },
-	 { "wxGLContext_GetWindow", _wrap_wxGLContext_GetWindow, METH_VARARGS },
-	 { "wxGLContext_SwapBuffers", _wrap_wxGLContext_SwapBuffers, METH_VARARGS },
-	 { "wxGLContext_SetColour", _wrap_wxGLContext_SetColour, METH_VARARGS },
-	 { "wxGLContext_SetCurrent", _wrap_wxGLContext_SetCurrent, METH_VARARGS },
-	 { "delete_wxGLContext", _wrap_delete_wxGLContext, METH_VARARGS },
-	 { "new_wxGLContext", _wrap_new_wxGLContext, METH_VARARGS },
-	 { "glViewport", _wrap_glViewport, METH_VARARGS },
-	 { "glVertexPointer", _wrap_glVertexPointer, METH_VARARGS },
-	 { "glVertex4sv", _wrap_glVertex4sv, METH_VARARGS },
-	 { "glVertex4s", _wrap_glVertex4s, METH_VARARGS },
-	 { "glVertex4iv", _wrap_glVertex4iv, METH_VARARGS },
-	 { "glVertex4i", _wrap_glVertex4i, METH_VARARGS },
-	 { "glVertex4fv", _wrap_glVertex4fv, METH_VARARGS },
-	 { "glVertex4f", _wrap_glVertex4f, METH_VARARGS },
-	 { "glVertex4dv", _wrap_glVertex4dv, METH_VARARGS },
-	 { "glVertex4d", _wrap_glVertex4d, METH_VARARGS },
-	 { "glVertex3sv", _wrap_glVertex3sv, METH_VARARGS },
-	 { "glVertex3s", _wrap_glVertex3s, METH_VARARGS },
-	 { "glVertex3iv", _wrap_glVertex3iv, METH_VARARGS },
-	 { "glVertex3i", _wrap_glVertex3i, METH_VARARGS },
-	 { "glVertex3fv", _wrap_glVertex3fv, METH_VARARGS },
-	 { "glVertex3f", _wrap_glVertex3f, METH_VARARGS },
-	 { "glVertex3dv", _wrap_glVertex3dv, METH_VARARGS },
-	 { "glVertex3d", _wrap_glVertex3d, METH_VARARGS },
-	 { "glVertex2sv", _wrap_glVertex2sv, METH_VARARGS },
-	 { "glVertex2s", _wrap_glVertex2s, METH_VARARGS },
-	 { "glVertex2iv", _wrap_glVertex2iv, METH_VARARGS },
-	 { "glVertex2i", _wrap_glVertex2i, METH_VARARGS },
-	 { "glVertex2fv", _wrap_glVertex2fv, METH_VARARGS },
-	 { "glVertex2f", _wrap_glVertex2f, METH_VARARGS },
-	 { "glVertex2dv", _wrap_glVertex2dv, METH_VARARGS },
-	 { "glVertex2d", _wrap_glVertex2d, METH_VARARGS },
-	 { "glTranslatef", _wrap_glTranslatef, METH_VARARGS },
-	 { "glTranslated", _wrap_glTranslated, METH_VARARGS },
-	 { "glTexSubImage2D", _wrap_glTexSubImage2D, METH_VARARGS },
-	 { "glTexSubImage1D", _wrap_glTexSubImage1D, METH_VARARGS },
-	 { "glTexParameteriv", _wrap_glTexParameteriv, METH_VARARGS },
-	 { "glTexParameteri", _wrap_glTexParameteri, METH_VARARGS },
-	 { "glTexParameterfv", _wrap_glTexParameterfv, METH_VARARGS },
-	 { "glTexParameterf", _wrap_glTexParameterf, METH_VARARGS },
-	 { "glTexImage2D", _wrap_glTexImage2D, METH_VARARGS },
-	 { "glTexImage1D", _wrap_glTexImage1D, METH_VARARGS },
-	 { "glTexGeniv", _wrap_glTexGeniv, METH_VARARGS },
-	 { "glTexGeni", _wrap_glTexGeni, METH_VARARGS },
-	 { "glTexGenfv", _wrap_glTexGenfv, METH_VARARGS },
-	 { "glTexGenf", _wrap_glTexGenf, METH_VARARGS },
-	 { "glTexGendv", _wrap_glTexGendv, METH_VARARGS },
-	 { "glTexGend", _wrap_glTexGend, METH_VARARGS },
-	 { "glTexEnviv", _wrap_glTexEnviv, METH_VARARGS },
-	 { "glTexEnvi", _wrap_glTexEnvi, METH_VARARGS },
-	 { "glTexEnvfv", _wrap_glTexEnvfv, METH_VARARGS },
-	 { "glTexEnvf", _wrap_glTexEnvf, METH_VARARGS },
-	 { "glTexCoordPointer", _wrap_glTexCoordPointer, METH_VARARGS },
-	 { "glTexCoord4sv", _wrap_glTexCoord4sv, METH_VARARGS },
-	 { "glTexCoord4s", _wrap_glTexCoord4s, METH_VARARGS },
-	 { "glTexCoord4iv", _wrap_glTexCoord4iv, METH_VARARGS },
-	 { "glTexCoord4i", _wrap_glTexCoord4i, METH_VARARGS },
-	 { "glTexCoord4fv", _wrap_glTexCoord4fv, METH_VARARGS },
-	 { "glTexCoord4f", _wrap_glTexCoord4f, METH_VARARGS },
-	 { "glTexCoord4dv", _wrap_glTexCoord4dv, METH_VARARGS },
-	 { "glTexCoord4d", _wrap_glTexCoord4d, METH_VARARGS },
-	 { "glTexCoord3sv", _wrap_glTexCoord3sv, METH_VARARGS },
-	 { "glTexCoord3s", _wrap_glTexCoord3s, METH_VARARGS },
-	 { "glTexCoord3iv", _wrap_glTexCoord3iv, METH_VARARGS },
-	 { "glTexCoord3i", _wrap_glTexCoord3i, METH_VARARGS },
-	 { "glTexCoord3fv", _wrap_glTexCoord3fv, METH_VARARGS },
-	 { "glTexCoord3f", _wrap_glTexCoord3f, METH_VARARGS },
-	 { "glTexCoord3dv", _wrap_glTexCoord3dv, METH_VARARGS },
-	 { "glTexCoord3d", _wrap_glTexCoord3d, METH_VARARGS },
-	 { "glTexCoord2sv", _wrap_glTexCoord2sv, METH_VARARGS },
-	 { "glTexCoord2s", _wrap_glTexCoord2s, METH_VARARGS },
-	 { "glTexCoord2iv", _wrap_glTexCoord2iv, METH_VARARGS },
-	 { "glTexCoord2i", _wrap_glTexCoord2i, METH_VARARGS },
-	 { "glTexCoord2fv", _wrap_glTexCoord2fv, METH_VARARGS },
-	 { "glTexCoord2f", _wrap_glTexCoord2f, METH_VARARGS },
-	 { "glTexCoord2dv", _wrap_glTexCoord2dv, METH_VARARGS },
-	 { "glTexCoord2d", _wrap_glTexCoord2d, METH_VARARGS },
-	 { "glTexCoord1sv", _wrap_glTexCoord1sv, METH_VARARGS },
-	 { "glTexCoord1s", _wrap_glTexCoord1s, METH_VARARGS },
-	 { "glTexCoord1iv", _wrap_glTexCoord1iv, METH_VARARGS },
-	 { "glTexCoord1i", _wrap_glTexCoord1i, METH_VARARGS },
-	 { "glTexCoord1fv", _wrap_glTexCoord1fv, METH_VARARGS },
-	 { "glTexCoord1f", _wrap_glTexCoord1f, METH_VARARGS },
-	 { "glTexCoord1dv", _wrap_glTexCoord1dv, METH_VARARGS },
-	 { "glTexCoord1d", _wrap_glTexCoord1d, METH_VARARGS },
-	 { "glStencilOp", _wrap_glStencilOp, METH_VARARGS },
-	 { "glStencilMask", _wrap_glStencilMask, METH_VARARGS },
-	 { "glStencilFunc", _wrap_glStencilFunc, METH_VARARGS },
-	 { "glShadeModel", _wrap_glShadeModel, METH_VARARGS },
-	 { "glSelectBuffer", _wrap_glSelectBuffer, METH_VARARGS },
-	 { "glScissor", _wrap_glScissor, METH_VARARGS },
-	 { "glScalef", _wrap_glScalef, METH_VARARGS },
-	 { "glScaled", _wrap_glScaled, METH_VARARGS },
-	 { "glRotatef", _wrap_glRotatef, METH_VARARGS },
-	 { "glRotated", _wrap_glRotated, METH_VARARGS },
-	 { "glRenderMode", _wrap_glRenderMode, METH_VARARGS },
-	 { "glRectsv", _wrap_glRectsv, METH_VARARGS },
-	 { "glRects", _wrap_glRects, METH_VARARGS },
-	 { "glRectiv", _wrap_glRectiv, METH_VARARGS },
-	 { "glRecti", _wrap_glRecti, METH_VARARGS },
-	 { "glRectfv", _wrap_glRectfv, METH_VARARGS },
-	 { "glRectf", _wrap_glRectf, METH_VARARGS },
-	 { "glRectdv", _wrap_glRectdv, METH_VARARGS },
-	 { "glRectd", _wrap_glRectd, METH_VARARGS },
-	 { "glReadPixels", _wrap_glReadPixels, METH_VARARGS },
-	 { "glReadBuffer", _wrap_glReadBuffer, METH_VARARGS },
-	 { "glRasterPos4sv", _wrap_glRasterPos4sv, METH_VARARGS },
-	 { "glRasterPos4s", _wrap_glRasterPos4s, METH_VARARGS },
-	 { "glRasterPos4iv", _wrap_glRasterPos4iv, METH_VARARGS },
-	 { "glRasterPos4i", _wrap_glRasterPos4i, METH_VARARGS },
-	 { "glRasterPos4fv", _wrap_glRasterPos4fv, METH_VARARGS },
-	 { "glRasterPos4f", _wrap_glRasterPos4f, METH_VARARGS },
-	 { "glRasterPos4dv", _wrap_glRasterPos4dv, METH_VARARGS },
-	 { "glRasterPos4d", _wrap_glRasterPos4d, METH_VARARGS },
-	 { "glRasterPos3sv", _wrap_glRasterPos3sv, METH_VARARGS },
-	 { "glRasterPos3s", _wrap_glRasterPos3s, METH_VARARGS },
-	 { "glRasterPos3iv", _wrap_glRasterPos3iv, METH_VARARGS },
-	 { "glRasterPos3i", _wrap_glRasterPos3i, METH_VARARGS },
-	 { "glRasterPos3fv", _wrap_glRasterPos3fv, METH_VARARGS },
-	 { "glRasterPos3f", _wrap_glRasterPos3f, METH_VARARGS },
-	 { "glRasterPos3dv", _wrap_glRasterPos3dv, METH_VARARGS },
-	 { "glRasterPos3d", _wrap_glRasterPos3d, METH_VARARGS },
-	 { "glRasterPos2sv", _wrap_glRasterPos2sv, METH_VARARGS },
-	 { "glRasterPos2s", _wrap_glRasterPos2s, METH_VARARGS },
-	 { "glRasterPos2iv", _wrap_glRasterPos2iv, METH_VARARGS },
-	 { "glRasterPos2i", _wrap_glRasterPos2i, METH_VARARGS },
-	 { "glRasterPos2fv", _wrap_glRasterPos2fv, METH_VARARGS },
-	 { "glRasterPos2f", _wrap_glRasterPos2f, METH_VARARGS },
-	 { "glRasterPos2dv", _wrap_glRasterPos2dv, METH_VARARGS },
-	 { "glRasterPos2d", _wrap_glRasterPos2d, METH_VARARGS },
-	 { "glPushName", _wrap_glPushName, METH_VARARGS },
-	 { "glPushMatrix", _wrap_glPushMatrix, METH_VARARGS },
-	 { "glPushClientAttrib", _wrap_glPushClientAttrib, METH_VARARGS },
-	 { "glPushAttrib", _wrap_glPushAttrib, METH_VARARGS },
-	 { "glPrioritizeTextures", _wrap_glPrioritizeTextures, METH_VARARGS },
-	 { "glPopName", _wrap_glPopName, METH_VARARGS },
-	 { "glPopMatrix", _wrap_glPopMatrix, METH_VARARGS },
-	 { "glPopClientAttrib", _wrap_glPopClientAttrib, METH_VARARGS },
-	 { "glPopAttrib", _wrap_glPopAttrib, METH_VARARGS },
-	 { "glPolygonStipple", _wrap_glPolygonStipple, METH_VARARGS },
-	 { "glPolygonOffset", _wrap_glPolygonOffset, METH_VARARGS },
-	 { "glPolygonMode", _wrap_glPolygonMode, METH_VARARGS },
-	 { "glPointSize", _wrap_glPointSize, METH_VARARGS },
-	 { "glPixelZoom", _wrap_glPixelZoom, METH_VARARGS },
-	 { "glPixelTransferi", _wrap_glPixelTransferi, METH_VARARGS },
-	 { "glPixelTransferf", _wrap_glPixelTransferf, METH_VARARGS },
-	 { "glPixelStorei", _wrap_glPixelStorei, METH_VARARGS },
-	 { "glPixelStoref", _wrap_glPixelStoref, METH_VARARGS },
-	 { "glPixelMapusv", _wrap_glPixelMapusv, METH_VARARGS },
-	 { "glPixelMapuiv", _wrap_glPixelMapuiv, METH_VARARGS },
-	 { "glPixelMapfv", _wrap_glPixelMapfv, METH_VARARGS },
-	 { "glPassThrough", _wrap_glPassThrough, METH_VARARGS },
-	 { "glOrtho", _wrap_glOrtho, METH_VARARGS },
-	 { "glNormalPointer", _wrap_glNormalPointer, METH_VARARGS },
-	 { "glNormal3sv", _wrap_glNormal3sv, METH_VARARGS },
-	 { "glNormal3s", _wrap_glNormal3s, METH_VARARGS },
-	 { "glNormal3iv", _wrap_glNormal3iv, METH_VARARGS },
-	 { "glNormal3i", _wrap_glNormal3i, METH_VARARGS },
-	 { "glNormal3fv", _wrap_glNormal3fv, METH_VARARGS },
-	 { "glNormal3f", _wrap_glNormal3f, METH_VARARGS },
-	 { "glNormal3dv", _wrap_glNormal3dv, METH_VARARGS },
-	 { "glNormal3d", _wrap_glNormal3d, METH_VARARGS },
-	 { "glNormal3bv", _wrap_glNormal3bv, METH_VARARGS },
-	 { "glNormal3b", _wrap_glNormal3b, METH_VARARGS },
-	 { "glNewList", _wrap_glNewList, METH_VARARGS },
-	 { "glMultMatrixf", _wrap_glMultMatrixf, METH_VARARGS },
-	 { "glMultMatrixd", _wrap_glMultMatrixd, METH_VARARGS },
-	 { "glMatrixMode", _wrap_glMatrixMode, METH_VARARGS },
-	 { "glMaterialiv", _wrap_glMaterialiv, METH_VARARGS },
-	 { "glMateriali", _wrap_glMateriali, METH_VARARGS },
-	 { "glMaterialfv", _wrap_glMaterialfv, METH_VARARGS },
-	 { "glMaterialf", _wrap_glMaterialf, METH_VARARGS },
-	 { "glMapGrid2f", _wrap_glMapGrid2f, METH_VARARGS },
-	 { "glMapGrid2d", _wrap_glMapGrid2d, METH_VARARGS },
-	 { "glMapGrid1f", _wrap_glMapGrid1f, METH_VARARGS },
-	 { "glMapGrid1d", _wrap_glMapGrid1d, METH_VARARGS },
-	 { "glMap2f", _wrap_glMap2f, METH_VARARGS },
-	 { "glMap2d", _wrap_glMap2d, METH_VARARGS },
-	 { "glMap1f", _wrap_glMap1f, METH_VARARGS },
-	 { "glMap1d", _wrap_glMap1d, METH_VARARGS },
-	 { "glLogicOp", _wrap_glLogicOp, METH_VARARGS },
-	 { "glLoadName", _wrap_glLoadName, METH_VARARGS },
-	 { "glLoadMatrixf", _wrap_glLoadMatrixf, METH_VARARGS },
-	 { "glLoadMatrixd", _wrap_glLoadMatrixd, METH_VARARGS },
-	 { "glLoadIdentity", _wrap_glLoadIdentity, METH_VARARGS },
-	 { "glListBase", _wrap_glListBase, METH_VARARGS },
-	 { "glLineWidth", _wrap_glLineWidth, METH_VARARGS },
-	 { "glLineStipple", _wrap_glLineStipple, METH_VARARGS },
-	 { "glLightiv", _wrap_glLightiv, METH_VARARGS },
-	 { "glLighti", _wrap_glLighti, METH_VARARGS },
-	 { "glLightfv", _wrap_glLightfv, METH_VARARGS },
-	 { "glLightf", _wrap_glLightf, METH_VARARGS },
-	 { "glLightModeliv", _wrap_glLightModeliv, METH_VARARGS },
-	 { "glLightModeli", _wrap_glLightModeli, METH_VARARGS },
-	 { "glLightModelfv", _wrap_glLightModelfv, METH_VARARGS },
-	 { "glLightModelf", _wrap_glLightModelf, METH_VARARGS },
-	 { "glIsTexture", _wrap_glIsTexture, METH_VARARGS },
-	 { "glIsList", _wrap_glIsList, METH_VARARGS },
-	 { "glIsEnabled", _wrap_glIsEnabled, METH_VARARGS },
-	 { "glInterleavedArrays", _wrap_glInterleavedArrays, METH_VARARGS },
-	 { "glInitNames", _wrap_glInitNames, METH_VARARGS },
-	 { "glIndexubv", _wrap_glIndexubv, METH_VARARGS },
-	 { "glIndexub", _wrap_glIndexub, METH_VARARGS },
-	 { "glIndexsv", _wrap_glIndexsv, METH_VARARGS },
-	 { "glIndexs", _wrap_glIndexs, METH_VARARGS },
-	 { "glIndexiv", _wrap_glIndexiv, METH_VARARGS },
-	 { "glIndexi", _wrap_glIndexi, METH_VARARGS },
-	 { "glIndexfv", _wrap_glIndexfv, METH_VARARGS },
-	 { "glIndexf", _wrap_glIndexf, METH_VARARGS },
-	 { "glIndexdv", _wrap_glIndexdv, METH_VARARGS },
-	 { "glIndexd", _wrap_glIndexd, METH_VARARGS },
-	 { "glIndexPointer", _wrap_glIndexPointer, METH_VARARGS },
-	 { "glIndexMask", _wrap_glIndexMask, METH_VARARGS },
-	 { "glHint", _wrap_glHint, METH_VARARGS },
-	 { "glGetTexParameteriv", _wrap_glGetTexParameteriv, METH_VARARGS },
-	 { "glGetTexParameterfv", _wrap_glGetTexParameterfv, METH_VARARGS },
-	 { "glGetTexLevelParameteriv", _wrap_glGetTexLevelParameteriv, METH_VARARGS },
-	 { "glGetTexLevelParameterfv", _wrap_glGetTexLevelParameterfv, METH_VARARGS },
-	 { "glGetTexImage", _wrap_glGetTexImage, METH_VARARGS },
-	 { "glGetTexGeniv", _wrap_glGetTexGeniv, METH_VARARGS },
-	 { "glGetTexGenfv", _wrap_glGetTexGenfv, METH_VARARGS },
-	 { "glGetTexGendv", _wrap_glGetTexGendv, METH_VARARGS },
-	 { "glGetTexEnviv", _wrap_glGetTexEnviv, METH_VARARGS },
-	 { "glGetTexEnvfv", _wrap_glGetTexEnvfv, METH_VARARGS },
-	 { "glGetString", _wrap_glGetString, METH_VARARGS },
-	 { "glGetPolygonStipple", _wrap_glGetPolygonStipple, METH_VARARGS },
-	 { "glGetPointerv", _wrap_glGetPointerv, METH_VARARGS },
-	 { "glGetPixelMapusv", _wrap_glGetPixelMapusv, METH_VARARGS },
-	 { "glGetPixelMapuiv", _wrap_glGetPixelMapuiv, METH_VARARGS },
-	 { "glGetPixelMapfv", _wrap_glGetPixelMapfv, METH_VARARGS },
-	 { "glGetMaterialiv", _wrap_glGetMaterialiv, METH_VARARGS },
-	 { "glGetMaterialfv", _wrap_glGetMaterialfv, METH_VARARGS },
-	 { "glGetMapiv", _wrap_glGetMapiv, METH_VARARGS },
-	 { "glGetMapfv", _wrap_glGetMapfv, METH_VARARGS },
-	 { "glGetMapdv", _wrap_glGetMapdv, METH_VARARGS },
-	 { "glGetLightiv", _wrap_glGetLightiv, METH_VARARGS },
-	 { "glGetLightfv", _wrap_glGetLightfv, METH_VARARGS },
-	 { "glGetIntegerv", _wrap_glGetIntegerv, METH_VARARGS },
-	 { "glGetFloatv", _wrap_glGetFloatv, METH_VARARGS },
-	 { "glGetError", _wrap_glGetError, METH_VARARGS },
-	 { "glGetDoublev", _wrap_glGetDoublev, METH_VARARGS },
-	 { "glGetClipPlane", _wrap_glGetClipPlane, METH_VARARGS },
-	 { "glGetBooleanv", _wrap_glGetBooleanv, METH_VARARGS },
-	 { "glGenTextures", _wrap_glGenTextures, METH_VARARGS },
-	 { "glGenLists", _wrap_glGenLists, METH_VARARGS },
-	 { "glFrustum", _wrap_glFrustum, METH_VARARGS },
-	 { "glFrontFace", _wrap_glFrontFace, METH_VARARGS },
-	 { "glFogiv", _wrap_glFogiv, METH_VARARGS },
-	 { "glFogi", _wrap_glFogi, METH_VARARGS },
-	 { "glFogfv", _wrap_glFogfv, METH_VARARGS },
-	 { "glFogf", _wrap_glFogf, METH_VARARGS },
-	 { "glFlush", _wrap_glFlush, METH_VARARGS },
-	 { "glFinish", _wrap_glFinish, METH_VARARGS },
-	 { "glFeedbackBuffer", _wrap_glFeedbackBuffer, METH_VARARGS },
-	 { "glEvalPoint2", _wrap_glEvalPoint2, METH_VARARGS },
-	 { "glEvalPoint1", _wrap_glEvalPoint1, METH_VARARGS },
-	 { "glEvalMesh2", _wrap_glEvalMesh2, METH_VARARGS },
-	 { "glEvalMesh1", _wrap_glEvalMesh1, METH_VARARGS },
-	 { "glEvalCoord2fv", _wrap_glEvalCoord2fv, METH_VARARGS },
-	 { "glEvalCoord2f", _wrap_glEvalCoord2f, METH_VARARGS },
-	 { "glEvalCoord2dv", _wrap_glEvalCoord2dv, METH_VARARGS },
-	 { "glEvalCoord2d", _wrap_glEvalCoord2d, METH_VARARGS },
-	 { "glEvalCoord1fv", _wrap_glEvalCoord1fv, METH_VARARGS },
-	 { "glEvalCoord1f", _wrap_glEvalCoord1f, METH_VARARGS },
-	 { "glEvalCoord1dv", _wrap_glEvalCoord1dv, METH_VARARGS },
-	 { "glEvalCoord1d", _wrap_glEvalCoord1d, METH_VARARGS },
-	 { "glEndList", _wrap_glEndList, METH_VARARGS },
-	 { "glEnd", _wrap_glEnd, METH_VARARGS },
-	 { "glEnableClientState", _wrap_glEnableClientState, METH_VARARGS },
-	 { "glEnable", _wrap_glEnable, METH_VARARGS },
-	 { "glEdgeFlagv", _wrap_glEdgeFlagv, METH_VARARGS },
-	 { "glEdgeFlagPointer", _wrap_glEdgeFlagPointer, METH_VARARGS },
-	 { "glEdgeFlag", _wrap_glEdgeFlag, METH_VARARGS },
-	 { "glDrawPixels", _wrap_glDrawPixels, METH_VARARGS },
-	 { "glDrawElements", _wrap_glDrawElements, METH_VARARGS },
-	 { "glDrawBuffer", _wrap_glDrawBuffer, METH_VARARGS },
-	 { "glDrawArrays", _wrap_glDrawArrays, METH_VARARGS },
-	 { "glDisableClientState", _wrap_glDisableClientState, METH_VARARGS },
-	 { "glDisable", _wrap_glDisable, METH_VARARGS },
-	 { "glDepthRange", _wrap_glDepthRange, METH_VARARGS },
-	 { "glDepthMask", _wrap_glDepthMask, METH_VARARGS },
-	 { "glDepthFunc", _wrap_glDepthFunc, METH_VARARGS },
-	 { "glDeleteTextures", _wrap_glDeleteTextures, METH_VARARGS },
-	 { "glDeleteLists", _wrap_glDeleteLists, METH_VARARGS },
-	 { "glCullFace", _wrap_glCullFace, METH_VARARGS },
-	 { "glCopyTexSubImage2D", _wrap_glCopyTexSubImage2D, METH_VARARGS },
-	 { "glCopyTexSubImage1D", _wrap_glCopyTexSubImage1D, METH_VARARGS },
-	 { "glCopyTexImage2D", _wrap_glCopyTexImage2D, METH_VARARGS },
-	 { "glCopyTexImage1D", _wrap_glCopyTexImage1D, METH_VARARGS },
-	 { "glCopyPixels", _wrap_glCopyPixels, METH_VARARGS },
-	 { "glColorPointer", _wrap_glColorPointer, METH_VARARGS },
-	 { "glColorMaterial", _wrap_glColorMaterial, METH_VARARGS },
-	 { "glColorMask", _wrap_glColorMask, METH_VARARGS },
-	 { "glColor4usv", _wrap_glColor4usv, METH_VARARGS },
-	 { "glColor4us", _wrap_glColor4us, METH_VARARGS },
-	 { "glColor4uiv", _wrap_glColor4uiv, METH_VARARGS },
-	 { "glColor4ui", _wrap_glColor4ui, METH_VARARGS },
-	 { "glColor4ubv", _wrap_glColor4ubv, METH_VARARGS },
-	 { "glColor4ub", _wrap_glColor4ub, METH_VARARGS },
-	 { "glColor4sv", _wrap_glColor4sv, METH_VARARGS },
-	 { "glColor4s", _wrap_glColor4s, METH_VARARGS },
-	 { "glColor4iv", _wrap_glColor4iv, METH_VARARGS },
-	 { "glColor4i", _wrap_glColor4i, METH_VARARGS },
-	 { "glColor4fv", _wrap_glColor4fv, METH_VARARGS },
-	 { "glColor4f", _wrap_glColor4f, METH_VARARGS },
-	 { "glColor4dv", _wrap_glColor4dv, METH_VARARGS },
-	 { "glColor4d", _wrap_glColor4d, METH_VARARGS },
-	 { "glColor4bv", _wrap_glColor4bv, METH_VARARGS },
-	 { "glColor4b", _wrap_glColor4b, METH_VARARGS },
-	 { "glColor3usv", _wrap_glColor3usv, METH_VARARGS },
-	 { "glColor3us", _wrap_glColor3us, METH_VARARGS },
-	 { "glColor3uiv", _wrap_glColor3uiv, METH_VARARGS },
-	 { "glColor3ui", _wrap_glColor3ui, METH_VARARGS },
-	 { "glColor3ubv", _wrap_glColor3ubv, METH_VARARGS },
-	 { "glColor3ub", _wrap_glColor3ub, METH_VARARGS },
-	 { "glColor3sv", _wrap_glColor3sv, METH_VARARGS },
-	 { "glColor3s", _wrap_glColor3s, METH_VARARGS },
-	 { "glColor3iv", _wrap_glColor3iv, METH_VARARGS },
-	 { "glColor3i", _wrap_glColor3i, METH_VARARGS },
-	 { "glColor3fv", _wrap_glColor3fv, METH_VARARGS },
-	 { "glColor3f", _wrap_glColor3f, METH_VARARGS },
-	 { "glColor3dv", _wrap_glColor3dv, METH_VARARGS },
-	 { "glColor3d", _wrap_glColor3d, METH_VARARGS },
-	 { "glColor3bv", _wrap_glColor3bv, METH_VARARGS },
-	 { "glColor3b", _wrap_glColor3b, METH_VARARGS },
-	 { "glClipPlane", _wrap_glClipPlane, METH_VARARGS },
-	 { "glClearStencil", _wrap_glClearStencil, METH_VARARGS },
-	 { "glClearIndex", _wrap_glClearIndex, METH_VARARGS },
-	 { "glClearDepth", _wrap_glClearDepth, METH_VARARGS },
-	 { "glClearColor", _wrap_glClearColor, METH_VARARGS },
-	 { "glClearAccum", _wrap_glClearAccum, METH_VARARGS },
-	 { "glClear", _wrap_glClear, METH_VARARGS },
-	 { "glCallLists", _wrap_glCallLists, METH_VARARGS },
-	 { "glCallList", _wrap_glCallList, METH_VARARGS },
-	 { "glBlendFunc", _wrap_glBlendFunc, METH_VARARGS },
-	 { "glBitmap", _wrap_glBitmap, METH_VARARGS },
-	 { "glBindTexture", _wrap_glBindTexture, METH_VARARGS },
-	 { "glBegin", _wrap_glBegin, METH_VARARGS },
-	 { "glArrayElement", _wrap_glArrayElement, METH_VARARGS },
-	 { "glAreTexturesResident", _wrap_glAreTexturesResident, METH_VARARGS },
-	 { "glAlphaFunc", _wrap_glAlphaFunc, METH_VARARGS },
-	 { "glAccum", _wrap_glAccum, METH_VARARGS },
-	 { "glAddSwapHintRectWin", _wrap_glAddSwapHintRectWin, METH_VARARGS },
-	 { "glIndexMaterialSGI", _wrap_glIndexMaterialSGI, METH_VARARGS },
-	 { "glIndexFuncSGI", _wrap_glIndexFuncSGI, METH_VARARGS },
-	 { "glCullParameterfvSGI", _wrap_glCullParameterfvSGI, METH_VARARGS },
-	 { "glCullParameterdvSGI", _wrap_glCullParameterdvSGI, METH_VARARGS },
-	 { "glUnlockArraysSGI", _wrap_glUnlockArraysSGI, METH_VARARGS },
-	 { "glLockArraysSGI", _wrap_glLockArraysSGI, METH_VARARGS },
-	 { "glGetColorTavleParameterivEXT", _wrap_glGetColorTavleParameterivEXT, METH_VARARGS },
-	 { "glGetColorTableParamaterfvEXT", _wrap_glGetColorTableParamaterfvEXT, METH_VARARGS },
-	 { "glGetColorTableEXT", _wrap_glGetColorTableEXT, METH_VARARGS },
-	 { "glCopyColorTableEXT", _wrap_glCopyColorTableEXT, METH_VARARGS },
-	 { "glColorTableEXT", _wrap_glColorTableEXT, METH_VARARGS },
-	 { "glColorSubtableEXT", _wrap_glColorSubtableEXT, METH_VARARGS },
-	 { "glVertexPointerEXT", _wrap_glVertexPointerEXT, METH_VARARGS },
-	 { "glTexCoordPointerEXT", _wrap_glTexCoordPointerEXT, METH_VARARGS },
-	 { "glNormalPointerEXT", _wrap_glNormalPointerEXT, METH_VARARGS },
-	 { "glIndexPointerEXT", _wrap_glIndexPointerEXT, METH_VARARGS },
-	 { "glGetPointervEXT", _wrap_glGetPointervEXT, METH_VARARGS },
-	 { "glEdgeFlagPointerEXT", _wrap_glEdgeFlagPointerEXT, METH_VARARGS },
-	 { "glDrawArraysEXT", _wrap_glDrawArraysEXT, METH_VARARGS },
-	 { "glColorPointerEXT", _wrap_glColorPointerEXT, METH_VARARGS },
-	 { "glArrayElementEXT", _wrap_glArrayElementEXT, METH_VARARGS },
+	 { "wxGLCanvas_GetContext", (PyCFunction) _wrap_wxGLCanvas_GetContext, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGLCanvas_SwapBuffers", (PyCFunction) _wrap_wxGLCanvas_SwapBuffers, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGLCanvas_SetColour", (PyCFunction) _wrap_wxGLCanvas_SetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGLCanvas_SetCurrent", (PyCFunction) _wrap_wxGLCanvas_SetCurrent, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxGLCanvas", (PyCFunction) _wrap_new_wxGLCanvas, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGLContext_GetWindow", (PyCFunction) _wrap_wxGLContext_GetWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGLContext_SwapBuffers", (PyCFunction) _wrap_wxGLContext_SwapBuffers, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGLContext_SetColour", (PyCFunction) _wrap_wxGLContext_SetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGLContext_SetCurrent", (PyCFunction) _wrap_wxGLContext_SetCurrent, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxGLContext", (PyCFunction) _wrap_delete_wxGLContext, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxGLContext", (PyCFunction) _wrap_new_wxGLContext, METH_VARARGS | METH_KEYWORDS },
+	 { "glViewport", (PyCFunction) _wrap_glViewport, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertexPointer", (PyCFunction) _wrap_glVertexPointer, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4sv", (PyCFunction) _wrap_glVertex4sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4s", (PyCFunction) _wrap_glVertex4s, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4iv", (PyCFunction) _wrap_glVertex4iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4i", (PyCFunction) _wrap_glVertex4i, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4fv", (PyCFunction) _wrap_glVertex4fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4f", (PyCFunction) _wrap_glVertex4f, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4dv", (PyCFunction) _wrap_glVertex4dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex4d", (PyCFunction) _wrap_glVertex4d, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3sv", (PyCFunction) _wrap_glVertex3sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3s", (PyCFunction) _wrap_glVertex3s, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3iv", (PyCFunction) _wrap_glVertex3iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3i", (PyCFunction) _wrap_glVertex3i, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3fv", (PyCFunction) _wrap_glVertex3fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3f", (PyCFunction) _wrap_glVertex3f, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3dv", (PyCFunction) _wrap_glVertex3dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex3d", (PyCFunction) _wrap_glVertex3d, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2sv", (PyCFunction) _wrap_glVertex2sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2s", (PyCFunction) _wrap_glVertex2s, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2iv", (PyCFunction) _wrap_glVertex2iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2i", (PyCFunction) _wrap_glVertex2i, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2fv", (PyCFunction) _wrap_glVertex2fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2f", (PyCFunction) _wrap_glVertex2f, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2dv", (PyCFunction) _wrap_glVertex2dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertex2d", (PyCFunction) _wrap_glVertex2d, METH_VARARGS | METH_KEYWORDS },
+	 { "glTranslatef", (PyCFunction) _wrap_glTranslatef, METH_VARARGS | METH_KEYWORDS },
+	 { "glTranslated", (PyCFunction) _wrap_glTranslated, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexSubImage2D", (PyCFunction) _wrap_glTexSubImage2D, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexSubImage1D", (PyCFunction) _wrap_glTexSubImage1D, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexParameteriv", (PyCFunction) _wrap_glTexParameteriv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexParameteri", (PyCFunction) _wrap_glTexParameteri, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexParameterfv", (PyCFunction) _wrap_glTexParameterfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexParameterf", (PyCFunction) _wrap_glTexParameterf, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexImage2D", (PyCFunction) _wrap_glTexImage2D, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexImage1D", (PyCFunction) _wrap_glTexImage1D, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexGeniv", (PyCFunction) _wrap_glTexGeniv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexGeni", (PyCFunction) _wrap_glTexGeni, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexGenfv", (PyCFunction) _wrap_glTexGenfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexGenf", (PyCFunction) _wrap_glTexGenf, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexGendv", (PyCFunction) _wrap_glTexGendv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexGend", (PyCFunction) _wrap_glTexGend, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexEnviv", (PyCFunction) _wrap_glTexEnviv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexEnvi", (PyCFunction) _wrap_glTexEnvi, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexEnvfv", (PyCFunction) _wrap_glTexEnvfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexEnvf", (PyCFunction) _wrap_glTexEnvf, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoordPointer", (PyCFunction) _wrap_glTexCoordPointer, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4sv", (PyCFunction) _wrap_glTexCoord4sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4s", (PyCFunction) _wrap_glTexCoord4s, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4iv", (PyCFunction) _wrap_glTexCoord4iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4i", (PyCFunction) _wrap_glTexCoord4i, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4fv", (PyCFunction) _wrap_glTexCoord4fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4f", (PyCFunction) _wrap_glTexCoord4f, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4dv", (PyCFunction) _wrap_glTexCoord4dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord4d", (PyCFunction) _wrap_glTexCoord4d, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3sv", (PyCFunction) _wrap_glTexCoord3sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3s", (PyCFunction) _wrap_glTexCoord3s, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3iv", (PyCFunction) _wrap_glTexCoord3iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3i", (PyCFunction) _wrap_glTexCoord3i, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3fv", (PyCFunction) _wrap_glTexCoord3fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3f", (PyCFunction) _wrap_glTexCoord3f, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3dv", (PyCFunction) _wrap_glTexCoord3dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord3d", (PyCFunction) _wrap_glTexCoord3d, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2sv", (PyCFunction) _wrap_glTexCoord2sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2s", (PyCFunction) _wrap_glTexCoord2s, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2iv", (PyCFunction) _wrap_glTexCoord2iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2i", (PyCFunction) _wrap_glTexCoord2i, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2fv", (PyCFunction) _wrap_glTexCoord2fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2f", (PyCFunction) _wrap_glTexCoord2f, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2dv", (PyCFunction) _wrap_glTexCoord2dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord2d", (PyCFunction) _wrap_glTexCoord2d, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1sv", (PyCFunction) _wrap_glTexCoord1sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1s", (PyCFunction) _wrap_glTexCoord1s, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1iv", (PyCFunction) _wrap_glTexCoord1iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1i", (PyCFunction) _wrap_glTexCoord1i, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1fv", (PyCFunction) _wrap_glTexCoord1fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1f", (PyCFunction) _wrap_glTexCoord1f, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1dv", (PyCFunction) _wrap_glTexCoord1dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoord1d", (PyCFunction) _wrap_glTexCoord1d, METH_VARARGS | METH_KEYWORDS },
+	 { "glStencilOp", (PyCFunction) _wrap_glStencilOp, METH_VARARGS | METH_KEYWORDS },
+	 { "glStencilMask", (PyCFunction) _wrap_glStencilMask, METH_VARARGS | METH_KEYWORDS },
+	 { "glStencilFunc", (PyCFunction) _wrap_glStencilFunc, METH_VARARGS | METH_KEYWORDS },
+	 { "glShadeModel", (PyCFunction) _wrap_glShadeModel, METH_VARARGS | METH_KEYWORDS },
+	 { "glSelectBuffer", (PyCFunction) _wrap_glSelectBuffer, METH_VARARGS | METH_KEYWORDS },
+	 { "glScissor", (PyCFunction) _wrap_glScissor, METH_VARARGS | METH_KEYWORDS },
+	 { "glScalef", (PyCFunction) _wrap_glScalef, METH_VARARGS | METH_KEYWORDS },
+	 { "glScaled", (PyCFunction) _wrap_glScaled, METH_VARARGS | METH_KEYWORDS },
+	 { "glRotatef", (PyCFunction) _wrap_glRotatef, METH_VARARGS | METH_KEYWORDS },
+	 { "glRotated", (PyCFunction) _wrap_glRotated, METH_VARARGS | METH_KEYWORDS },
+	 { "glRenderMode", (PyCFunction) _wrap_glRenderMode, METH_VARARGS | METH_KEYWORDS },
+	 { "glRectsv", (PyCFunction) _wrap_glRectsv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRects", (PyCFunction) _wrap_glRects, METH_VARARGS | METH_KEYWORDS },
+	 { "glRectiv", (PyCFunction) _wrap_glRectiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRecti", (PyCFunction) _wrap_glRecti, METH_VARARGS | METH_KEYWORDS },
+	 { "glRectfv", (PyCFunction) _wrap_glRectfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRectf", (PyCFunction) _wrap_glRectf, METH_VARARGS | METH_KEYWORDS },
+	 { "glRectdv", (PyCFunction) _wrap_glRectdv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRectd", (PyCFunction) _wrap_glRectd, METH_VARARGS | METH_KEYWORDS },
+	 { "glReadPixels", (PyCFunction) _wrap_glReadPixels, METH_VARARGS | METH_KEYWORDS },
+	 { "glReadBuffer", (PyCFunction) _wrap_glReadBuffer, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4sv", (PyCFunction) _wrap_glRasterPos4sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4s", (PyCFunction) _wrap_glRasterPos4s, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4iv", (PyCFunction) _wrap_glRasterPos4iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4i", (PyCFunction) _wrap_glRasterPos4i, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4fv", (PyCFunction) _wrap_glRasterPos4fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4f", (PyCFunction) _wrap_glRasterPos4f, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4dv", (PyCFunction) _wrap_glRasterPos4dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos4d", (PyCFunction) _wrap_glRasterPos4d, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3sv", (PyCFunction) _wrap_glRasterPos3sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3s", (PyCFunction) _wrap_glRasterPos3s, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3iv", (PyCFunction) _wrap_glRasterPos3iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3i", (PyCFunction) _wrap_glRasterPos3i, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3fv", (PyCFunction) _wrap_glRasterPos3fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3f", (PyCFunction) _wrap_glRasterPos3f, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3dv", (PyCFunction) _wrap_glRasterPos3dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos3d", (PyCFunction) _wrap_glRasterPos3d, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2sv", (PyCFunction) _wrap_glRasterPos2sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2s", (PyCFunction) _wrap_glRasterPos2s, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2iv", (PyCFunction) _wrap_glRasterPos2iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2i", (PyCFunction) _wrap_glRasterPos2i, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2fv", (PyCFunction) _wrap_glRasterPos2fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2f", (PyCFunction) _wrap_glRasterPos2f, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2dv", (PyCFunction) _wrap_glRasterPos2dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glRasterPos2d", (PyCFunction) _wrap_glRasterPos2d, METH_VARARGS | METH_KEYWORDS },
+	 { "glPushName", (PyCFunction) _wrap_glPushName, METH_VARARGS | METH_KEYWORDS },
+	 { "glPushMatrix", (PyCFunction) _wrap_glPushMatrix, METH_VARARGS | METH_KEYWORDS },
+	 { "glPushClientAttrib", (PyCFunction) _wrap_glPushClientAttrib, METH_VARARGS | METH_KEYWORDS },
+	 { "glPushAttrib", (PyCFunction) _wrap_glPushAttrib, METH_VARARGS | METH_KEYWORDS },
+	 { "glPrioritizeTextures", (PyCFunction) _wrap_glPrioritizeTextures, METH_VARARGS | METH_KEYWORDS },
+	 { "glPopName", (PyCFunction) _wrap_glPopName, METH_VARARGS | METH_KEYWORDS },
+	 { "glPopMatrix", (PyCFunction) _wrap_glPopMatrix, METH_VARARGS | METH_KEYWORDS },
+	 { "glPopClientAttrib", (PyCFunction) _wrap_glPopClientAttrib, METH_VARARGS | METH_KEYWORDS },
+	 { "glPopAttrib", (PyCFunction) _wrap_glPopAttrib, METH_VARARGS | METH_KEYWORDS },
+	 { "glPolygonStipple", (PyCFunction) _wrap_glPolygonStipple, METH_VARARGS | METH_KEYWORDS },
+	 { "glPolygonOffset", (PyCFunction) _wrap_glPolygonOffset, METH_VARARGS | METH_KEYWORDS },
+	 { "glPolygonMode", (PyCFunction) _wrap_glPolygonMode, METH_VARARGS | METH_KEYWORDS },
+	 { "glPointSize", (PyCFunction) _wrap_glPointSize, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelZoom", (PyCFunction) _wrap_glPixelZoom, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelTransferi", (PyCFunction) _wrap_glPixelTransferi, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelTransferf", (PyCFunction) _wrap_glPixelTransferf, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelStorei", (PyCFunction) _wrap_glPixelStorei, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelStoref", (PyCFunction) _wrap_glPixelStoref, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelMapusv", (PyCFunction) _wrap_glPixelMapusv, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelMapuiv", (PyCFunction) _wrap_glPixelMapuiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glPixelMapfv", (PyCFunction) _wrap_glPixelMapfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glPassThrough", (PyCFunction) _wrap_glPassThrough, METH_VARARGS | METH_KEYWORDS },
+	 { "glOrtho", (PyCFunction) _wrap_glOrtho, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormalPointer", (PyCFunction) _wrap_glNormalPointer, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3sv", (PyCFunction) _wrap_glNormal3sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3s", (PyCFunction) _wrap_glNormal3s, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3iv", (PyCFunction) _wrap_glNormal3iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3i", (PyCFunction) _wrap_glNormal3i, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3fv", (PyCFunction) _wrap_glNormal3fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3f", (PyCFunction) _wrap_glNormal3f, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3dv", (PyCFunction) _wrap_glNormal3dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3d", (PyCFunction) _wrap_glNormal3d, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3bv", (PyCFunction) _wrap_glNormal3bv, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormal3b", (PyCFunction) _wrap_glNormal3b, METH_VARARGS | METH_KEYWORDS },
+	 { "glNewList", (PyCFunction) _wrap_glNewList, METH_VARARGS | METH_KEYWORDS },
+	 { "glMultMatrixf", (PyCFunction) _wrap_glMultMatrixf, METH_VARARGS | METH_KEYWORDS },
+	 { "glMultMatrixd", (PyCFunction) _wrap_glMultMatrixd, METH_VARARGS | METH_KEYWORDS },
+	 { "glMatrixMode", (PyCFunction) _wrap_glMatrixMode, METH_VARARGS | METH_KEYWORDS },
+	 { "glMaterialiv", (PyCFunction) _wrap_glMaterialiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glMateriali", (PyCFunction) _wrap_glMateriali, METH_VARARGS | METH_KEYWORDS },
+	 { "glMaterialfv", (PyCFunction) _wrap_glMaterialfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glMaterialf", (PyCFunction) _wrap_glMaterialf, METH_VARARGS | METH_KEYWORDS },
+	 { "glMapGrid2f", (PyCFunction) _wrap_glMapGrid2f, METH_VARARGS | METH_KEYWORDS },
+	 { "glMapGrid2d", (PyCFunction) _wrap_glMapGrid2d, METH_VARARGS | METH_KEYWORDS },
+	 { "glMapGrid1f", (PyCFunction) _wrap_glMapGrid1f, METH_VARARGS | METH_KEYWORDS },
+	 { "glMapGrid1d", (PyCFunction) _wrap_glMapGrid1d, METH_VARARGS | METH_KEYWORDS },
+	 { "glMap2f", (PyCFunction) _wrap_glMap2f, METH_VARARGS | METH_KEYWORDS },
+	 { "glMap2d", (PyCFunction) _wrap_glMap2d, METH_VARARGS | METH_KEYWORDS },
+	 { "glMap1f", (PyCFunction) _wrap_glMap1f, METH_VARARGS | METH_KEYWORDS },
+	 { "glMap1d", (PyCFunction) _wrap_glMap1d, METH_VARARGS | METH_KEYWORDS },
+	 { "glLogicOp", (PyCFunction) _wrap_glLogicOp, METH_VARARGS | METH_KEYWORDS },
+	 { "glLoadName", (PyCFunction) _wrap_glLoadName, METH_VARARGS | METH_KEYWORDS },
+	 { "glLoadMatrixf", (PyCFunction) _wrap_glLoadMatrixf, METH_VARARGS | METH_KEYWORDS },
+	 { "glLoadMatrixd", (PyCFunction) _wrap_glLoadMatrixd, METH_VARARGS | METH_KEYWORDS },
+	 { "glLoadIdentity", (PyCFunction) _wrap_glLoadIdentity, METH_VARARGS | METH_KEYWORDS },
+	 { "glListBase", (PyCFunction) _wrap_glListBase, METH_VARARGS | METH_KEYWORDS },
+	 { "glLineWidth", (PyCFunction) _wrap_glLineWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "glLineStipple", (PyCFunction) _wrap_glLineStipple, METH_VARARGS | METH_KEYWORDS },
+	 { "glLightiv", (PyCFunction) _wrap_glLightiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glLighti", (PyCFunction) _wrap_glLighti, METH_VARARGS | METH_KEYWORDS },
+	 { "glLightfv", (PyCFunction) _wrap_glLightfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glLightf", (PyCFunction) _wrap_glLightf, METH_VARARGS | METH_KEYWORDS },
+	 { "glLightModeliv", (PyCFunction) _wrap_glLightModeliv, METH_VARARGS | METH_KEYWORDS },
+	 { "glLightModeli", (PyCFunction) _wrap_glLightModeli, METH_VARARGS | METH_KEYWORDS },
+	 { "glLightModelfv", (PyCFunction) _wrap_glLightModelfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glLightModelf", (PyCFunction) _wrap_glLightModelf, METH_VARARGS | METH_KEYWORDS },
+	 { "glIsTexture", (PyCFunction) _wrap_glIsTexture, METH_VARARGS | METH_KEYWORDS },
+	 { "glIsList", (PyCFunction) _wrap_glIsList, METH_VARARGS | METH_KEYWORDS },
+	 { "glIsEnabled", (PyCFunction) _wrap_glIsEnabled, METH_VARARGS | METH_KEYWORDS },
+	 { "glInterleavedArrays", (PyCFunction) _wrap_glInterleavedArrays, METH_VARARGS | METH_KEYWORDS },
+	 { "glInitNames", (PyCFunction) _wrap_glInitNames, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexubv", (PyCFunction) _wrap_glIndexubv, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexub", (PyCFunction) _wrap_glIndexub, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexsv", (PyCFunction) _wrap_glIndexsv, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexs", (PyCFunction) _wrap_glIndexs, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexiv", (PyCFunction) _wrap_glIndexiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexi", (PyCFunction) _wrap_glIndexi, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexfv", (PyCFunction) _wrap_glIndexfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexf", (PyCFunction) _wrap_glIndexf, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexdv", (PyCFunction) _wrap_glIndexdv, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexd", (PyCFunction) _wrap_glIndexd, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexPointer", (PyCFunction) _wrap_glIndexPointer, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexMask", (PyCFunction) _wrap_glIndexMask, METH_VARARGS | METH_KEYWORDS },
+	 { "glHint", (PyCFunction) _wrap_glHint, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexParameteriv", (PyCFunction) _wrap_glGetTexParameteriv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexParameterfv", (PyCFunction) _wrap_glGetTexParameterfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexLevelParameteriv", (PyCFunction) _wrap_glGetTexLevelParameteriv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexLevelParameterfv", (PyCFunction) _wrap_glGetTexLevelParameterfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexImage", (PyCFunction) _wrap_glGetTexImage, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexGeniv", (PyCFunction) _wrap_glGetTexGeniv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexGenfv", (PyCFunction) _wrap_glGetTexGenfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexGendv", (PyCFunction) _wrap_glGetTexGendv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexEnviv", (PyCFunction) _wrap_glGetTexEnviv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetTexEnvfv", (PyCFunction) _wrap_glGetTexEnvfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetString", (PyCFunction) _wrap_glGetString, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetPolygonStipple", (PyCFunction) _wrap_glGetPolygonStipple, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetPointerv", (PyCFunction) _wrap_glGetPointerv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetPixelMapusv", (PyCFunction) _wrap_glGetPixelMapusv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetPixelMapuiv", (PyCFunction) _wrap_glGetPixelMapuiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetPixelMapfv", (PyCFunction) _wrap_glGetPixelMapfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetMaterialiv", (PyCFunction) _wrap_glGetMaterialiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetMaterialfv", (PyCFunction) _wrap_glGetMaterialfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetMapiv", (PyCFunction) _wrap_glGetMapiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetMapfv", (PyCFunction) _wrap_glGetMapfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetMapdv", (PyCFunction) _wrap_glGetMapdv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetLightiv", (PyCFunction) _wrap_glGetLightiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetLightfv", (PyCFunction) _wrap_glGetLightfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetIntegerv", (PyCFunction) _wrap_glGetIntegerv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetFloatv", (PyCFunction) _wrap_glGetFloatv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetError", (PyCFunction) _wrap_glGetError, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetDoublev", (PyCFunction) _wrap_glGetDoublev, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetClipPlane", (PyCFunction) _wrap_glGetClipPlane, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetBooleanv", (PyCFunction) _wrap_glGetBooleanv, METH_VARARGS | METH_KEYWORDS },
+	 { "glGenTextures", (PyCFunction) _wrap_glGenTextures, METH_VARARGS | METH_KEYWORDS },
+	 { "glGenLists", (PyCFunction) _wrap_glGenLists, METH_VARARGS | METH_KEYWORDS },
+	 { "glFrustum", (PyCFunction) _wrap_glFrustum, METH_VARARGS | METH_KEYWORDS },
+	 { "glFrontFace", (PyCFunction) _wrap_glFrontFace, METH_VARARGS | METH_KEYWORDS },
+	 { "glFogiv", (PyCFunction) _wrap_glFogiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glFogi", (PyCFunction) _wrap_glFogi, METH_VARARGS | METH_KEYWORDS },
+	 { "glFogfv", (PyCFunction) _wrap_glFogfv, METH_VARARGS | METH_KEYWORDS },
+	 { "glFogf", (PyCFunction) _wrap_glFogf, METH_VARARGS | METH_KEYWORDS },
+	 { "glFlush", (PyCFunction) _wrap_glFlush, METH_VARARGS | METH_KEYWORDS },
+	 { "glFinish", (PyCFunction) _wrap_glFinish, METH_VARARGS | METH_KEYWORDS },
+	 { "glFeedbackBuffer", (PyCFunction) _wrap_glFeedbackBuffer, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalPoint2", (PyCFunction) _wrap_glEvalPoint2, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalPoint1", (PyCFunction) _wrap_glEvalPoint1, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalMesh2", (PyCFunction) _wrap_glEvalMesh2, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalMesh1", (PyCFunction) _wrap_glEvalMesh1, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord2fv", (PyCFunction) _wrap_glEvalCoord2fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord2f", (PyCFunction) _wrap_glEvalCoord2f, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord2dv", (PyCFunction) _wrap_glEvalCoord2dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord2d", (PyCFunction) _wrap_glEvalCoord2d, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord1fv", (PyCFunction) _wrap_glEvalCoord1fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord1f", (PyCFunction) _wrap_glEvalCoord1f, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord1dv", (PyCFunction) _wrap_glEvalCoord1dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glEvalCoord1d", (PyCFunction) _wrap_glEvalCoord1d, METH_VARARGS | METH_KEYWORDS },
+	 { "glEndList", (PyCFunction) _wrap_glEndList, METH_VARARGS | METH_KEYWORDS },
+	 { "glEnd", (PyCFunction) _wrap_glEnd, METH_VARARGS | METH_KEYWORDS },
+	 { "glEnableClientState", (PyCFunction) _wrap_glEnableClientState, METH_VARARGS | METH_KEYWORDS },
+	 { "glEnable", (PyCFunction) _wrap_glEnable, METH_VARARGS | METH_KEYWORDS },
+	 { "glEdgeFlagv", (PyCFunction) _wrap_glEdgeFlagv, METH_VARARGS | METH_KEYWORDS },
+	 { "glEdgeFlagPointer", (PyCFunction) _wrap_glEdgeFlagPointer, METH_VARARGS | METH_KEYWORDS },
+	 { "glEdgeFlag", (PyCFunction) _wrap_glEdgeFlag, METH_VARARGS | METH_KEYWORDS },
+	 { "glDrawPixels", (PyCFunction) _wrap_glDrawPixels, METH_VARARGS | METH_KEYWORDS },
+	 { "glDrawElements", (PyCFunction) _wrap_glDrawElements, METH_VARARGS | METH_KEYWORDS },
+	 { "glDrawBuffer", (PyCFunction) _wrap_glDrawBuffer, METH_VARARGS | METH_KEYWORDS },
+	 { "glDrawArrays", (PyCFunction) _wrap_glDrawArrays, METH_VARARGS | METH_KEYWORDS },
+	 { "glDisableClientState", (PyCFunction) _wrap_glDisableClientState, METH_VARARGS | METH_KEYWORDS },
+	 { "glDisable", (PyCFunction) _wrap_glDisable, METH_VARARGS | METH_KEYWORDS },
+	 { "glDepthRange", (PyCFunction) _wrap_glDepthRange, METH_VARARGS | METH_KEYWORDS },
+	 { "glDepthMask", (PyCFunction) _wrap_glDepthMask, METH_VARARGS | METH_KEYWORDS },
+	 { "glDepthFunc", (PyCFunction) _wrap_glDepthFunc, METH_VARARGS | METH_KEYWORDS },
+	 { "glDeleteTextures", (PyCFunction) _wrap_glDeleteTextures, METH_VARARGS | METH_KEYWORDS },
+	 { "glDeleteLists", (PyCFunction) _wrap_glDeleteLists, METH_VARARGS | METH_KEYWORDS },
+	 { "glCullFace", (PyCFunction) _wrap_glCullFace, METH_VARARGS | METH_KEYWORDS },
+	 { "glCopyTexSubImage2D", (PyCFunction) _wrap_glCopyTexSubImage2D, METH_VARARGS | METH_KEYWORDS },
+	 { "glCopyTexSubImage1D", (PyCFunction) _wrap_glCopyTexSubImage1D, METH_VARARGS | METH_KEYWORDS },
+	 { "glCopyTexImage2D", (PyCFunction) _wrap_glCopyTexImage2D, METH_VARARGS | METH_KEYWORDS },
+	 { "glCopyTexImage1D", (PyCFunction) _wrap_glCopyTexImage1D, METH_VARARGS | METH_KEYWORDS },
+	 { "glCopyPixels", (PyCFunction) _wrap_glCopyPixels, METH_VARARGS | METH_KEYWORDS },
+	 { "glColorPointer", (PyCFunction) _wrap_glColorPointer, METH_VARARGS | METH_KEYWORDS },
+	 { "glColorMaterial", (PyCFunction) _wrap_glColorMaterial, METH_VARARGS | METH_KEYWORDS },
+	 { "glColorMask", (PyCFunction) _wrap_glColorMask, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4usv", (PyCFunction) _wrap_glColor4usv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4us", (PyCFunction) _wrap_glColor4us, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4uiv", (PyCFunction) _wrap_glColor4uiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4ui", (PyCFunction) _wrap_glColor4ui, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4ubv", (PyCFunction) _wrap_glColor4ubv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4ub", (PyCFunction) _wrap_glColor4ub, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4sv", (PyCFunction) _wrap_glColor4sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4s", (PyCFunction) _wrap_glColor4s, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4iv", (PyCFunction) _wrap_glColor4iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4i", (PyCFunction) _wrap_glColor4i, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4fv", (PyCFunction) _wrap_glColor4fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4f", (PyCFunction) _wrap_glColor4f, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4dv", (PyCFunction) _wrap_glColor4dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4d", (PyCFunction) _wrap_glColor4d, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4bv", (PyCFunction) _wrap_glColor4bv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor4b", (PyCFunction) _wrap_glColor4b, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3usv", (PyCFunction) _wrap_glColor3usv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3us", (PyCFunction) _wrap_glColor3us, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3uiv", (PyCFunction) _wrap_glColor3uiv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3ui", (PyCFunction) _wrap_glColor3ui, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3ubv", (PyCFunction) _wrap_glColor3ubv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3ub", (PyCFunction) _wrap_glColor3ub, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3sv", (PyCFunction) _wrap_glColor3sv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3s", (PyCFunction) _wrap_glColor3s, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3iv", (PyCFunction) _wrap_glColor3iv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3i", (PyCFunction) _wrap_glColor3i, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3fv", (PyCFunction) _wrap_glColor3fv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3f", (PyCFunction) _wrap_glColor3f, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3dv", (PyCFunction) _wrap_glColor3dv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3d", (PyCFunction) _wrap_glColor3d, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3bv", (PyCFunction) _wrap_glColor3bv, METH_VARARGS | METH_KEYWORDS },
+	 { "glColor3b", (PyCFunction) _wrap_glColor3b, METH_VARARGS | METH_KEYWORDS },
+	 { "glClipPlane", (PyCFunction) _wrap_glClipPlane, METH_VARARGS | METH_KEYWORDS },
+	 { "glClearStencil", (PyCFunction) _wrap_glClearStencil, METH_VARARGS | METH_KEYWORDS },
+	 { "glClearIndex", (PyCFunction) _wrap_glClearIndex, METH_VARARGS | METH_KEYWORDS },
+	 { "glClearDepth", (PyCFunction) _wrap_glClearDepth, METH_VARARGS | METH_KEYWORDS },
+	 { "glClearColor", (PyCFunction) _wrap_glClearColor, METH_VARARGS | METH_KEYWORDS },
+	 { "glClearAccum", (PyCFunction) _wrap_glClearAccum, METH_VARARGS | METH_KEYWORDS },
+	 { "glClear", (PyCFunction) _wrap_glClear, METH_VARARGS | METH_KEYWORDS },
+	 { "glCallLists", (PyCFunction) _wrap_glCallLists, METH_VARARGS | METH_KEYWORDS },
+	 { "glCallList", (PyCFunction) _wrap_glCallList, METH_VARARGS | METH_KEYWORDS },
+	 { "glBlendFunc", (PyCFunction) _wrap_glBlendFunc, METH_VARARGS | METH_KEYWORDS },
+	 { "glBitmap", (PyCFunction) _wrap_glBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "glBindTexture", (PyCFunction) _wrap_glBindTexture, METH_VARARGS | METH_KEYWORDS },
+	 { "glBegin", (PyCFunction) _wrap_glBegin, METH_VARARGS | METH_KEYWORDS },
+	 { "glArrayElement", (PyCFunction) _wrap_glArrayElement, METH_VARARGS | METH_KEYWORDS },
+	 { "glAreTexturesResident", (PyCFunction) _wrap_glAreTexturesResident, METH_VARARGS | METH_KEYWORDS },
+	 { "glAlphaFunc", (PyCFunction) _wrap_glAlphaFunc, METH_VARARGS | METH_KEYWORDS },
+	 { "glAccum", (PyCFunction) _wrap_glAccum, METH_VARARGS | METH_KEYWORDS },
+	 { "glAddSwapHintRectWin", (PyCFunction) _wrap_glAddSwapHintRectWin, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexMaterialSGI", (PyCFunction) _wrap_glIndexMaterialSGI, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexFuncSGI", (PyCFunction) _wrap_glIndexFuncSGI, METH_VARARGS | METH_KEYWORDS },
+	 { "glCullParameterfvSGI", (PyCFunction) _wrap_glCullParameterfvSGI, METH_VARARGS | METH_KEYWORDS },
+	 { "glCullParameterdvSGI", (PyCFunction) _wrap_glCullParameterdvSGI, METH_VARARGS | METH_KEYWORDS },
+	 { "glUnlockArraysSGI", (PyCFunction) _wrap_glUnlockArraysSGI, METH_VARARGS | METH_KEYWORDS },
+	 { "glLockArraysSGI", (PyCFunction) _wrap_glLockArraysSGI, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetColorTavleParameterivEXT", (PyCFunction) _wrap_glGetColorTavleParameterivEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetColorTableParamaterfvEXT", (PyCFunction) _wrap_glGetColorTableParamaterfvEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetColorTableEXT", (PyCFunction) _wrap_glGetColorTableEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glCopyColorTableEXT", (PyCFunction) _wrap_glCopyColorTableEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glColorTableEXT", (PyCFunction) _wrap_glColorTableEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glColorSubtableEXT", (PyCFunction) _wrap_glColorSubtableEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glVertexPointerEXT", (PyCFunction) _wrap_glVertexPointerEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glTexCoordPointerEXT", (PyCFunction) _wrap_glTexCoordPointerEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glNormalPointerEXT", (PyCFunction) _wrap_glNormalPointerEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glIndexPointerEXT", (PyCFunction) _wrap_glIndexPointerEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glGetPointervEXT", (PyCFunction) _wrap_glGetPointervEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glEdgeFlagPointerEXT", (PyCFunction) _wrap_glEdgeFlagPointerEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glDrawArraysEXT", (PyCFunction) _wrap_glDrawArraysEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glColorPointerEXT", (PyCFunction) _wrap_glColorPointerEXT, METH_VARARGS | METH_KEYWORDS },
+	 { "glArrayElementEXT", (PyCFunction) _wrap_glArrayElementEXT, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/modules/utils/.cvsignore b/utils/wxPython/modules/utils/.cvsignore
index 1a429af104..6a5a263c16 100644
--- a/utils/wxPython/modules/utils/.cvsignore
+++ b/utils/wxPython/modules/utils/.cvsignore
@@ -2,5 +2,6 @@ Makefile
 build.local
 utilsc.exp
 utilsc.ilk
+utilsc.pch
 utilsc.pyd
 wxp.pch
diff --git a/utils/wxPython/modules/utils/msw/utils.cpp b/utils/wxPython/modules/utils/msw/utils.cpp
index d18420e4a7..e593772604 100644
--- a/utils/wxPython/modules/utils/msw/utils.cpp
+++ b/utils/wxPython/modules/utils/msw/utils.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 802)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -133,7 +133,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 extern "C" {
 #endif
 #define new_wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxConfig(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxConfig * _result;
     wxString * _arg0 = (wxString *) &wxPyEmptyStr;
@@ -145,10 +145,11 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
+    char *_kwnames[] = { "appName","vendorName","localFilename","globalFilename","style", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|OOOOl:new_wxConfig",&_obj0,&_obj1,&_obj2,&_obj3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OOOOl:new_wxConfig",_kwnames,&_obj0,&_obj1,&_obj2,&_obj3,&_arg4)) 
         return NULL;
     if (_obj0)
 {
@@ -214,13 +215,14 @@ static PyObject *_wrap_new_wxConfig(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxConfig(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxConfig",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxConfig",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -240,13 +242,14 @@ static PyObject *_wrap_delete_wxConfig(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_DontCreateOnDemand(_swigobj)  (_swigobj->DontCreateOnDemand())
-static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_DontCreateOnDemand",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_DontCreateOnDemand",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -266,14 +269,15 @@ static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *arg
 }
 
 #define wxConfig_DeleteAll(_swigobj)  (_swigobj->DeleteAll())
-static PyObject *_wrap_wxConfig_DeleteAll(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_DeleteAll(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_DeleteAll",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_DeleteAll",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -292,7 +296,7 @@ static PyObject *_wrap_wxConfig_DeleteAll(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_DeleteEntry(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DeleteEntry(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
@@ -301,9 +305,10 @@ static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","key","bDeleteGroupIfEmpty", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxConfig_DeleteEntry",&_argo0,&_obj1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxConfig_DeleteEntry",_kwnames,&_argo0,&_obj1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -334,16 +339,17 @@ static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_DeleteGroup(_swigobj,_swigarg0)  (_swigobj->DeleteGroup(_swigarg0))
-static PyObject *_wrap_wxConfig_DeleteGroup(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_DeleteGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","key", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxConfig_DeleteGroup",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxConfig_DeleteGroup",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -373,16 +379,17 @@ static PyObject *_wrap_wxConfig_DeleteGroup(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_Exists(_swigobj,_swigarg0)  (_swigobj->Exists(_swigarg0))
-static PyObject *_wrap_wxConfig_Exists(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_Exists(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","strName", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxConfig_Exists",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxConfig_Exists",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -412,16 +419,17 @@ static PyObject *_wrap_wxConfig_Exists(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_Flush(_swigobj,_swigarg0)  (_swigobj->Flush(_swigarg0))
-static PyObject *_wrap_wxConfig_Flush(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_Flush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     bool  _arg1 = (bool ) FALSE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) FALSE;
+    char *_kwnames[] = { "self","bCurrentOnly", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxConfig_Flush",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxConfig_Flush",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -441,14 +449,15 @@ static PyObject *_wrap_wxConfig_Flush(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_GetAppName(_swigobj)  (_swigobj->GetAppName())
-static PyObject *_wrap_wxConfig_GetAppName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_GetAppName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_GetAppName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -479,14 +488,15 @@ static PyObject * wxConfig_GetFirstGroup(wxConfig *self) {
             cont = self->GetFirstGroup(value, index);
             return __EnumerationHelper(cont, value, index);
         }
-static PyObject *_wrap_wxConfig_GetFirstGroup(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetFirstGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_GetFirstGroup",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_GetFirstGroup",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -514,14 +524,15 @@ static PyObject * wxConfig_GetFirstEntry(wxConfig *self) {
             cont = self->GetFirstEntry(value, index);
             return __EnumerationHelper(cont, value, index);
         }
-static PyObject *_wrap_wxConfig_GetFirstEntry(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetFirstEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_GetFirstEntry",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_GetFirstEntry",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -548,15 +559,16 @@ static PyObject * wxConfig_GetNextGroup(wxConfig *self,long  index) {
             cont = self->GetNextGroup(value, index);
             return __EnumerationHelper(cont, value, index);
         }
-static PyObject *_wrap_wxConfig_GetNextGroup(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetNextGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","index", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxConfig_GetNextGroup",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxConfig_GetNextGroup",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -583,15 +595,16 @@ static PyObject * wxConfig_GetNextEntry(wxConfig *self,long  index) {
             cont = self->GetNextEntry(value, index);
             return __EnumerationHelper(cont, value, index);
         }
-static PyObject *_wrap_wxConfig_GetNextEntry(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetNextEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxConfig * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","index", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxConfig_GetNextEntry",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxConfig_GetNextEntry",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -612,16 +625,17 @@ static PyObject *_wrap_wxConfig_GetNextEntry(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_GetNumberOfEntries(_swigobj,_swigarg0)  (_swigobj->GetNumberOfEntries(_swigarg0))
-static PyObject *_wrap_wxConfig_GetNumberOfEntries(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetNumberOfEntries(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxConfig * _arg0;
     bool  _arg1 = (bool ) FALSE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) FALSE;
+    char *_kwnames[] = { "self","bRecursive", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxConfig_GetNumberOfEntries",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxConfig_GetNumberOfEntries",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -641,16 +655,17 @@ static PyObject *_wrap_wxConfig_GetNumberOfEntries(PyObject *self, PyObject *arg
 }
 
 #define wxConfig_GetNumberOfGroups(_swigobj,_swigarg0)  (_swigobj->GetNumberOfGroups(_swigarg0))
-static PyObject *_wrap_wxConfig_GetNumberOfGroups(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetNumberOfGroups(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxConfig * _arg0;
     bool  _arg1 = (bool ) FALSE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) FALSE;
+    char *_kwnames[] = { "self","bRecursive", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxConfig_GetNumberOfGroups",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxConfig_GetNumberOfGroups",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -670,14 +685,15 @@ static PyObject *_wrap_wxConfig_GetNumberOfGroups(PyObject *self, PyObject *args
 }
 
 #define wxConfig_GetPath(_swigobj)  (_swigobj->GetPath())
-static PyObject *_wrap_wxConfig_GetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_GetPath",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_GetPath",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -701,14 +717,15 @@ static PyObject *_wrap_wxConfig_GetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_GetVendorName(_swigobj)  (_swigobj->GetVendorName())
-static PyObject *_wrap_wxConfig_GetVendorName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_GetVendorName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_GetVendorName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_GetVendorName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -732,16 +749,17 @@ static PyObject *_wrap_wxConfig_GetVendorName(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_HasEntry(_swigobj,_swigarg0)  (_swigobj->HasEntry(_swigarg0))
-static PyObject *_wrap_wxConfig_HasEntry(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_HasEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","strName", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxConfig_HasEntry",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxConfig_HasEntry",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -771,16 +789,17 @@ static PyObject *_wrap_wxConfig_HasEntry(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_HasGroup(_swigobj,_swigarg0)  (_swigobj->HasGroup(_swigarg0))
-static PyObject *_wrap_wxConfig_HasGroup(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_HasGroup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","strName", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxConfig_HasGroup",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxConfig_HasGroup",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -810,14 +829,15 @@ static PyObject *_wrap_wxConfig_HasGroup(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_IsExpandingEnvVars(_swigobj)  (_swigobj->IsExpandingEnvVars())
-static PyObject *_wrap_wxConfig_IsExpandingEnvVars(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_IsExpandingEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_IsExpandingEnvVars",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_IsExpandingEnvVars",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -836,14 +856,15 @@ static PyObject *_wrap_wxConfig_IsExpandingEnvVars(PyObject *self, PyObject *arg
 }
 
 #define wxConfig_IsRecordingDefaults(_swigobj)  (_swigobj->IsRecordingDefaults())
-static PyObject *_wrap_wxConfig_IsRecordingDefaults(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_IsRecordingDefaults(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxConfig_IsRecordingDefaults",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxConfig_IsRecordingDefaults",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -862,7 +883,7 @@ static PyObject *_wrap_wxConfig_IsRecordingDefaults(PyObject *self, PyObject *ar
 }
 
 #define wxConfig_Read(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Read(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxConfig * _arg0;
@@ -871,9 +892,10 @@ static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","key","defaultVal", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|O:wxConfig_Read",&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxConfig_Read",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -920,7 +942,7 @@ static PyObject *_wrap_wxConfig_Read(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_ReadInt(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Read(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxConfig_ReadInt(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_ReadInt(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxConfig * _arg0;
@@ -928,9 +950,10 @@ static PyObject *_wrap_wxConfig_ReadInt(PyObject *self, PyObject *args) {
     long  _arg2 = (long ) 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","key","defaultVal", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|l:wxConfig_ReadInt",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|l:wxConfig_ReadInt",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -960,7 +983,7 @@ static PyObject *_wrap_wxConfig_ReadInt(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_ReadFloat(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Read(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     double  _result;
     wxConfig * _arg0;
@@ -968,9 +991,10 @@ static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args) {
     double  _arg2 = (double ) 0.0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","key","defaultVal", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|d:wxConfig_ReadFloat",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|d:wxConfig_ReadFloat",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1000,15 +1024,16 @@ static PyObject *_wrap_wxConfig_ReadFloat(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_SetExpandEnvVars(_swigobj,_swigarg0)  (_swigobj->SetExpandEnvVars(_swigarg0))
-static PyObject *_wrap_wxConfig_SetExpandEnvVars(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_SetExpandEnvVars(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxConfig * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","bDoIt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxConfig_SetExpandEnvVars",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxConfig_SetExpandEnvVars",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1029,15 +1054,16 @@ static PyObject *_wrap_wxConfig_SetExpandEnvVars(PyObject *self, PyObject *args)
 }
 
 #define wxConfig_SetPath(_swigobj,_swigarg0)  (_swigobj->SetPath(_swigarg0))
-static PyObject *_wrap_wxConfig_SetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxConfig * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","strPath", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxConfig_SetPath",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxConfig_SetPath",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1068,15 +1094,16 @@ static PyObject *_wrap_wxConfig_SetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_SetRecordDefaults(_swigobj,_swigarg0)  (_swigobj->SetRecordDefaults(_swigarg0))
-static PyObject *_wrap_wxConfig_SetRecordDefaults(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_SetRecordDefaults(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxConfig * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","bDoIt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxConfig_SetRecordDefaults",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxConfig_SetRecordDefaults",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1097,7 +1124,7 @@ static PyObject *_wrap_wxConfig_SetRecordDefaults(PyObject *self, PyObject *args
 }
 
 #define wxConfig_Write(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Write(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxConfig_Write(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_Write(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
@@ -1106,9 +1133,10 @@ static PyObject *_wrap_wxConfig_Write(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","key","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxConfig_Write",&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxConfig_Write",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1149,7 +1177,7 @@ static PyObject *_wrap_wxConfig_Write(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_WriteInt(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Write(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxConfig_WriteInt(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_WriteInt(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
@@ -1157,9 +1185,10 @@ static PyObject *_wrap_wxConfig_WriteInt(PyObject *self, PyObject *args) {
     long  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","key","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOl:wxConfig_WriteInt",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOl:wxConfig_WriteInt",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1189,7 +1218,7 @@ static PyObject *_wrap_wxConfig_WriteInt(PyObject *self, PyObject *args) {
 }
 
 #define wxConfig_WriteFloat(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Write(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxConfig * _arg0;
@@ -1197,9 +1226,10 @@ static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args) {
     double  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","key","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOd:wxConfig_WriteFloat",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOd:wxConfig_WriteFloat",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1229,36 +1259,36 @@ static PyObject *_wrap_wxConfig_WriteFloat(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef utilscMethods[] = {
-	 { "wxConfig_WriteFloat", _wrap_wxConfig_WriteFloat, METH_VARARGS },
-	 { "wxConfig_WriteInt", _wrap_wxConfig_WriteInt, METH_VARARGS },
-	 { "wxConfig_Write", _wrap_wxConfig_Write, METH_VARARGS },
-	 { "wxConfig_SetRecordDefaults", _wrap_wxConfig_SetRecordDefaults, METH_VARARGS },
-	 { "wxConfig_SetPath", _wrap_wxConfig_SetPath, METH_VARARGS },
-	 { "wxConfig_SetExpandEnvVars", _wrap_wxConfig_SetExpandEnvVars, METH_VARARGS },
-	 { "wxConfig_ReadFloat", _wrap_wxConfig_ReadFloat, METH_VARARGS },
-	 { "wxConfig_ReadInt", _wrap_wxConfig_ReadInt, METH_VARARGS },
-	 { "wxConfig_Read", _wrap_wxConfig_Read, METH_VARARGS },
-	 { "wxConfig_IsRecordingDefaults", _wrap_wxConfig_IsRecordingDefaults, METH_VARARGS },
-	 { "wxConfig_IsExpandingEnvVars", _wrap_wxConfig_IsExpandingEnvVars, METH_VARARGS },
-	 { "wxConfig_HasGroup", _wrap_wxConfig_HasGroup, METH_VARARGS },
-	 { "wxConfig_HasEntry", _wrap_wxConfig_HasEntry, METH_VARARGS },
-	 { "wxConfig_GetVendorName", _wrap_wxConfig_GetVendorName, METH_VARARGS },
-	 { "wxConfig_GetPath", _wrap_wxConfig_GetPath, METH_VARARGS },
-	 { "wxConfig_GetNumberOfGroups", _wrap_wxConfig_GetNumberOfGroups, METH_VARARGS },
-	 { "wxConfig_GetNumberOfEntries", _wrap_wxConfig_GetNumberOfEntries, METH_VARARGS },
-	 { "wxConfig_GetNextEntry", _wrap_wxConfig_GetNextEntry, METH_VARARGS },
-	 { "wxConfig_GetNextGroup", _wrap_wxConfig_GetNextGroup, METH_VARARGS },
-	 { "wxConfig_GetFirstEntry", _wrap_wxConfig_GetFirstEntry, METH_VARARGS },
-	 { "wxConfig_GetFirstGroup", _wrap_wxConfig_GetFirstGroup, METH_VARARGS },
-	 { "wxConfig_GetAppName", _wrap_wxConfig_GetAppName, METH_VARARGS },
-	 { "wxConfig_Flush", _wrap_wxConfig_Flush, METH_VARARGS },
-	 { "wxConfig_Exists", _wrap_wxConfig_Exists, METH_VARARGS },
-	 { "wxConfig_DeleteGroup", _wrap_wxConfig_DeleteGroup, METH_VARARGS },
-	 { "wxConfig_DeleteEntry", _wrap_wxConfig_DeleteEntry, METH_VARARGS },
-	 { "wxConfig_DeleteAll", _wrap_wxConfig_DeleteAll, METH_VARARGS },
-	 { "wxConfig_DontCreateOnDemand", _wrap_wxConfig_DontCreateOnDemand, METH_VARARGS },
-	 { "delete_wxConfig", _wrap_delete_wxConfig, METH_VARARGS },
-	 { "new_wxConfig", _wrap_new_wxConfig, METH_VARARGS },
+	 { "wxConfig_WriteFloat", (PyCFunction) _wrap_wxConfig_WriteFloat, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_WriteInt", (PyCFunction) _wrap_wxConfig_WriteInt, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_Write", (PyCFunction) _wrap_wxConfig_Write, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_SetRecordDefaults", (PyCFunction) _wrap_wxConfig_SetRecordDefaults, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_SetPath", (PyCFunction) _wrap_wxConfig_SetPath, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_SetExpandEnvVars", (PyCFunction) _wrap_wxConfig_SetExpandEnvVars, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_ReadFloat", (PyCFunction) _wrap_wxConfig_ReadFloat, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_ReadInt", (PyCFunction) _wrap_wxConfig_ReadInt, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_Read", (PyCFunction) _wrap_wxConfig_Read, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_IsRecordingDefaults", (PyCFunction) _wrap_wxConfig_IsRecordingDefaults, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_IsExpandingEnvVars", (PyCFunction) _wrap_wxConfig_IsExpandingEnvVars, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_HasGroup", (PyCFunction) _wrap_wxConfig_HasGroup, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_HasEntry", (PyCFunction) _wrap_wxConfig_HasEntry, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetVendorName", (PyCFunction) _wrap_wxConfig_GetVendorName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetPath", (PyCFunction) _wrap_wxConfig_GetPath, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetNumberOfGroups", (PyCFunction) _wrap_wxConfig_GetNumberOfGroups, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetNumberOfEntries", (PyCFunction) _wrap_wxConfig_GetNumberOfEntries, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetNextEntry", (PyCFunction) _wrap_wxConfig_GetNextEntry, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetNextGroup", (PyCFunction) _wrap_wxConfig_GetNextGroup, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetFirstEntry", (PyCFunction) _wrap_wxConfig_GetFirstEntry, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetFirstGroup", (PyCFunction) _wrap_wxConfig_GetFirstGroup, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_GetAppName", (PyCFunction) _wrap_wxConfig_GetAppName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_Flush", (PyCFunction) _wrap_wxConfig_Flush, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_Exists", (PyCFunction) _wrap_wxConfig_Exists, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_DeleteGroup", (PyCFunction) _wrap_wxConfig_DeleteGroup, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_DeleteEntry", (PyCFunction) _wrap_wxConfig_DeleteEntry, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_DeleteAll", (PyCFunction) _wrap_wxConfig_DeleteAll, METH_VARARGS | METH_KEYWORDS },
+	 { "wxConfig_DontCreateOnDemand", (PyCFunction) _wrap_wxConfig_DontCreateOnDemand, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxConfig", (PyCFunction) _wrap_delete_wxConfig, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxConfig", (PyCFunction) _wrap_new_wxConfig, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/build.cfg b/utils/wxPython/src/build.cfg
index 47bfffa6b4..edbb3c9917 100644
--- a/utils/wxPython/src/build.cfg
+++ b/utils/wxPython/src/build.cfg
@@ -24,14 +24,17 @@ dist:
 else:
     DEFAULTRULE = 'default: $(GENCODEDIR) lib$(HELPERLIB)$(SO) $(TARGET)'
     OTHERINSTALLTARGETS = 'installLibDemo installHelpers '
+    OTHERUNINSTALLTARGETS = 'uninstallLibDemo uninstallHelpers '
 
 
     OTHERRULES = """
 lib$(HELPERLIB)$(SO) : helpers.o libpy.o
 	$(LDSHARED) helpers.o libpy.o $(LFLAGS) -o $@
 
+
 installHelpers: $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO)
 
+
 $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO) : lib$(HELPERLIB)$(SO)
 	cp $< $@
 	@echo ---------------------------------------------------------
@@ -60,6 +63,20 @@ installLibDemo:
 	fi
 
 
+
+uninstallLibDemo:
+	@if [ "$(TARGETDIR)" != ".." -a "$(TARGETDIR)" != "$(WXWIN)/utils/wxPython" ]; then \\
+		rm -rf $(TARGETDIR)/lib;            		\\
+		rm -rf $(TARGETDIR)/demo;           		\\
+	fi
+
+
+uninstallHelpers:
+	rm -f $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO)
+
+
+#----------------------------------------------------------------------
+
 dist: tgz rpm
 
 tgz:
diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i
index ba3a8aa788..5785c2df4f 100644
--- a/utils/wxPython/src/gdi.i
+++ b/utils/wxPython/src/gdi.i
@@ -274,8 +274,15 @@ public:
     ~wxDC();
 
     void BeginDrawing();
-    bool Blit(long xdest, long ydest, long width, long height,
-                wxDC *source, long xsrc, long ysrc, long logical_func);
+//  %name(BlitXY)
+    bool Blit(long xdest, long ydest,
+              long width, long height,
+              wxDC *source, long xsrc, long ysrc,
+              int logicalFunc = wxCOPY, int useMask = FALSE);
+//      bool Blit(const wxPoint& destPt, const wxSize& sz,
+//                wxDC *source, const wxPoint& srcPt,
+//                int logicalFunc = wxCOPY, int useMask = FALSE);
+
     void Clear();
     void CrossHair(long x, long y);
     void DestroyClippingRegion();
@@ -354,21 +361,26 @@ public:
     void StartPage();
 
 
-    %addmethods {
-            // This one is my own creation...
-        void DrawBitmap(wxBitmap& bitmap, long x, long y, bool swapPalette=TRUE) {
-            wxMemoryDC* memDC = new wxMemoryDC;
-            memDC->SelectObject(bitmap);
-#ifdef __WXMSW__
-            if (swapPalette)
-                self->SetPalette(*bitmap.GetPalette());
-#endif
-            self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
-                    0, 0, self->GetLogicalFunction());
-            memDC->SelectObject(wxNullBitmap);
-            delete memDC;
-        }
-    }
+//  Don't need this one anymore as wxWindows has one...
+//      %addmethods {
+//              // This one is my own creation...
+//          void DrawBitmap(wxBitmap& bitmap, long x, long y, bool swapPalette=TRUE) {
+//              wxMemoryDC* memDC = new wxMemoryDC;
+//              memDC->SelectObject(bitmap);
+//  #ifdef __WXMSW__
+//              if (swapPalette)
+//                  self->SetPalette(*bitmap.GetPalette());
+//  #endif
+//              self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
+//                      0, 0, self->GetLogicalFunction());
+//              memDC->SelectObject(wxNullBitmap);
+//              delete memDC;
+//          }
+//      }
+
+    void DrawBitmap(const wxBitmap& bitmap, long x, long y,
+                    int useMask = FALSE);
+
 };
 
 
@@ -498,6 +510,7 @@ extern wxCursor *wxHOURGLASS_CURSOR;
 extern wxCursor *wxCROSS_CURSOR;
 
 extern wxBitmap wxNullBitmap;
+//extern wxMask   wxNullMask;
 extern wxIcon   wxNullIcon;
 extern wxCursor wxNullCursor;
 extern wxPen    wxNullPen;
diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp
index 3d5e345026..1cd1d14937 100644
--- a/utils/wxPython/src/helpers.cpp
+++ b/utils/wxPython/src/helpers.cpp
@@ -12,7 +12,7 @@
 
 
 #ifdef __WXGTK__
-#include "gtk/gtk.h"
+#include <gtk/gtk.h>
 #endif
 
 #undef DEBUG
diff --git a/utils/wxPython/src/helpers.h b/utils/wxPython/src/helpers.h
index bac46a2a96..a8c06a23e0 100644
--- a/utils/wxPython/src/helpers.h
+++ b/utils/wxPython/src/helpers.h
@@ -36,6 +36,14 @@ extern PyThreadState*   wxPyEventThreadState;
 extern bool             wxPyInEvent;
 #endif
 
+//---------------------------------------------------------------------------
+
+#if defined(__WXMSW__)
+#       define HELPEREXPORT __declspec(dllexport)
+#else
+#       define HELPEREXPORT
+#endif
+
 //----------------------------------------------------------------------
 
 class wxPyApp: public wxApp
@@ -59,7 +67,8 @@ extern PyObject* wxPython_dict;
 PyObject* __wxSetDictionary(PyObject*, PyObject* args);
 
 void wxPyEventThunker(wxObject*, wxEvent& event);
-PyObject* wxPyConstructObject(void* ptr, char* className);
+
+HELPEREXPORT PyObject* wxPyConstructObject(void* ptr, char* className);
 
 //----------------------------------------------------------------------
 
@@ -147,7 +156,7 @@ private:
 // wxPyCallbackHelper.
 //---------------------------------------------------------------------------
 
-class wxPyCallbackHelper {
+class HELPEREXPORT wxPyCallbackHelper {
 public:
     wxPyCallbackHelper();
     ~wxPyCallbackHelper();
@@ -171,6 +180,27 @@ private:
 // return type, if any as well as any parameter types.
 //---------------------------------------------------------------------------
 
+#define PYCALLBACK__(PCLASS, CBNAME)                                    \
+    void CBNAME() {                                                     \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("()"));                 \
+        else                                                            \
+            PCLASS::CBNAME();                                           \
+    }                                                                   \
+    void base_##CBNAME() {                                              \
+        PCLASS::CBNAME();                                               \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYPRIVATE                               \
+    void _setSelf(PyObject* self) {             \
+        m_myInst.setSelf(self);                 \
+    }                                           \
+    private: wxPyCallbackHelper m_myInst;
+
+//---------------------------------------------------------------------------
+
 #define PYCALLBACK_BOOL_INTINT(PCLASS, CBNAME)                          \
     bool CBNAME(int a, int b) {                                         \
         if (m_myInst.findCallback(#CBNAME))                             \
@@ -195,6 +225,8 @@ private:
         return PCLASS::CBNAME(a);                                       \
     }
 
+//---------------------------------------------------------------------------
+
 #define PYCALLBACK_BOOL_INT_pure(PCLASS, CBNAME)                        \
     bool CBNAME(int a) {                                                \
         if (m_myInst.findCallback(#CBNAME))                             \
@@ -205,26 +237,214 @@ private:
 
 //---------------------------------------------------------------------------
 
-#define PYCALLBACK__(PCLASS, CBNAME)                                    \
-    void CBNAME() {                                                     \
+#define PYCALLBACK__DC(PCLASS, CBNAME)                                  \
+    void CBNAME(wxDC& a) {                                              \
         if (m_myInst.findCallback(#CBNAME))                             \
-            m_myInst.callCallback(Py_BuildValue("()"));                 \
+            m_myInst.callCallback(Py_BuildValue("(O)",                  \
+                            wxPyConstructObject(&a, "wxDC")));           \
         else                                                            \
-            PCLASS::CBNAME();                                           \
+            PCLASS::CBNAME(a);                                          \
     }                                                                   \
-    void base_##CBNAME() {                                              \
-        PCLASS::CBNAME();                                               \
+    void base_##CBNAME(wxDC& a) {                                       \
+        PCLASS::CBNAME(a);                                              \
     }
 
+
+
 //---------------------------------------------------------------------------
 
-#define PYPRIVATE                               \
-    void _setSelf(PyObject* self) {             \
-        m_myInst.setSelf(self);                 \
-    }                                           \
-    private: wxPyCallbackHelper m_myInst;
+#define PYCALLBACK__DCBOOL(PCLASS, CBNAME)                              \
+    void CBNAME(wxDC& a, bool b) {                                      \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
+                            wxPyConstructObject(&a, "wxDC"), (int)b));   \
+        else                                                            \
+            PCLASS::CBNAME(a, b);                                       \
+    }                                                                   \
+    void base_##CBNAME(wxDC& a, bool b) {                               \
+        PCLASS::CBNAME(a, b);                                           \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__DCBOOL(PCLASS, CBNAME)                              \
+    void CBNAME(wxDC& a, bool b) {                                      \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
+                            wxPyConstructObject(&a, "wxDC"), (int)b));   \
+        else                                                            \
+            PCLASS::CBNAME(a, b);                                       \
+    }                                                                   \
+    void base_##CBNAME(wxDC& a, bool b) {                               \
+        PCLASS::CBNAME(a, b);                                           \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__2DBL(PCLASS, CBNAME)                                \
+    void CBNAME(double a, double b) {                                   \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(dd)",a,b));           \
+        else                                                            \
+            PCLASS::CBNAME(a, b);                                       \
+    }                                                                   \
+    void base_##CBNAME(double a, double b) {                            \
+        PCLASS::CBNAME(a, b);                                           \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__2DBL2INT(PCLASS, CBNAME)                            \
+    void CBNAME(double a, double b, int c, int d) {                     \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(ddii)",               \
+                                                       a,b,c,d));       \
+        else                                                            \
+            PCLASS::CBNAME(a, b, c, d);                                 \
+    }                                                                   \
+    void base_##CBNAME(double a, double b, int c, int d) {              \
+        PCLASS::CBNAME(a, b, c, d);                                     \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__DC4DBLBOOL(PCLASS, CBNAME)                          \
+    void CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(Oddddi)",             \
+                                   wxPyConstructObject(&a, "wxDC"),      \
+                                              b, c, d, e, (int)f));     \
+        else                                                            \
+            PCLASS::CBNAME(a, b, c, d, e, f);                           \
+    }                                                                   \
+    void base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+        PCLASS::CBNAME(a, b, c, d, e, f);                               \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK_BOOL_DC4DBLBOOL(PCLASS, CBNAME)                      \
+    bool CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+        if (m_myInst.findCallback(#CBNAME))                             \
+            return m_myInst.callCallback(Py_BuildValue("(Oddddi)",      \
+                                   wxPyConstructObject(&a, "wxDC"),      \
+                                              b, c, d, e, (int)f));     \
+        else                                                            \
+            return PCLASS::CBNAME(a, b, c, d, e, f);                    \
+    }                                                                   \
+    bool base_##CBNAME(wxDC& a, double b, double c, double d, double e, bool f) {\
+        return PCLASS::CBNAME(a, b, c, d, e, f);                        \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__BOOL2DBL2INT(PCLASS, CBNAME)                        \
+    void CBNAME(bool a, double b, double c, int d, int e) {             \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(idii)",               \
+                                                (int)a,b,c,d,e));       \
+        else                                                            \
+            PCLASS::CBNAME(a, b, c, d, e);                              \
+    }                                                                   \
+    void base_##CBNAME(bool a, double b, double c, int d, int e) {      \
+        PCLASS::CBNAME(a, b, c, d, e);                                  \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__DC4DBL(PCLASS, CBNAME)                              \
+    void CBNAME(wxDC& a, double b, double c, double d, double e) {     \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(Odddd)",              \
+                                   wxPyConstructObject(&a, "wxDC"),      \
+                                                     b, c, d, e));      \
+        else                                                            \
+            PCLASS::CBNAME(a, b, c, d, e);                              \
+    }                                                                   \
+    void base_##CBNAME(wxDC& a, double b, double c, double d, double e) {\
+        PCLASS::CBNAME(a, b, c, d, e);                                  \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__DCBOOL(PCLASS, CBNAME)                              \
+    void CBNAME(wxDC& a, bool b) {                                      \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(Oi)",                 \
+                                   wxPyConstructObject(&a, "wxDC"),      \
+                                                     (int)b));          \
+        else                                                            \
+            PCLASS::CBNAME(a, b);                                       \
+    }                                                                   \
+    void base_##CBNAME(wxDC& a, bool b) {                               \
+        PCLASS::CBNAME(a, b);                                           \
+    }
 
 //---------------------------------------------------------------------------
 
+#define PYCALLBACK__WXCPBOOL2DBL2INT(PCLASS, CBNAME)                    \
+    void CBNAME(wxControlPoint* a, bool b, double c, double d,          \
+                int e, int f) {                                         \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(Oiddii)",             \
+                                 wxPyConstructObject(a, "wxControlPoint"),\
+                                 (int)b, c, d, e, f));                  \
+        else                                                            \
+            PCLASS::CBNAME(a, b, c, d, e, f);                           \
+    }                                                                   \
+    void base_##CBNAME(wxControlPoint* a, bool b, double c, double d,   \
+                       int e, int f) {                                  \
+        PCLASS::CBNAME(a, b, c, d, e, f);                               \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__WXCP2DBL2INT(PCLASS, CBNAME)                        \
+    void CBNAME(wxControlPoint* a, double b, double c, int d, int e) {  \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(Oddii)",              \
+                                 wxPyConstructObject(a, "wxControlPoint"),\
+                                 b, c, d, e));                          \
+        else                                                            \
+            PCLASS::CBNAME(a, b, c, d, e);                              \
+    }                                                                   \
+    void base_##CBNAME(wxControlPoint* a, double b, double c,           \
+                       int d, int e) {                                  \
+        PCLASS::CBNAME(a, b, c, d, e);                                  \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__2DBLINT(PCLASS, CBNAME)                             \
+    void CBNAME(double a, double b, int c) {                            \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(ddi)", a,b,c));       \
+        else                                                            \
+            PCLASS::CBNAME(a, b, c);                                    \
+    }                                                                   \
+    void base_##CBNAME(double a, double b, int c) {                     \
+        PCLASS::CBNAME(a, b, c);                                        \
+    }
+
+//---------------------------------------------------------------------------
+
+#define PYCALLBACK__BOOL2DBLINT(PCLASS, CBNAME)                         \
+    void CBNAME(bool a, double b, double c, int d) {                    \
+        if (m_myInst.findCallback(#CBNAME))                             \
+            m_myInst.callCallback(Py_BuildValue("(iddi)", (int)a,b,c,d));\
+        else                                                            \
+            PCLASS::CBNAME(a, b, c, d);                                 \
+    }                                                                   \
+    void base_##CBNAME(bool a, double b, double c, int d) {             \
+        PCLASS::CBNAME(a, b, c, d);                                     \
+    }
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+
 #endif
 
+
+
diff --git a/utils/wxPython/src/misc.i b/utils/wxPython/src/misc.i
index faef0a7a9a..e82ac86b78 100644
--- a/utils/wxPython/src/misc.i
+++ b/utils/wxPython/src/misc.i
@@ -68,8 +68,24 @@ public:
     double y;
     wxRealPoint(double x=0.0, double y=0.0);
     ~wxRealPoint();
+
+    %addmethods {
+        void Set(double x, double y) {
+            self->x = x;
+            self->y = y;
+        }
+        PyObject* asTuple() {
+            PyObject* tup = PyTuple_New(2);
+            PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
+            PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
+            return tup;
+        }
+    }
+    %pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
+    %pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
 };
 
+
 class wxPoint {
 public:
     long x;
diff --git a/utils/wxPython/src/msw/cmndlgs.cpp b/utils/wxPython/src/msw/cmndlgs.cpp
index c7ab22e788..00854f6ae0 100644
--- a/utils/wxPython/src/msw/cmndlgs.cpp
+++ b/utils/wxPython/src/msw/cmndlgs.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -122,13 +122,14 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 extern "C" {
 #endif
 #define new_wxColourData() (new wxColourData())
-static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxColourData")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxColourData",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -146,13 +147,14 @@ static PyObject *_wrap_new_wxColourData(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxColourData(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxColourData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxColourData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -172,14 +174,15 @@ static PyObject *_wrap_delete_wxColourData(PyObject *self, PyObject *args) {
 }
 
 #define wxColourData_GetChooseFull(_swigobj)  (_swigobj->GetChooseFull())
-static PyObject *_wrap_wxColourData_GetChooseFull(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_GetChooseFull(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxColourData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourData_GetChooseFull",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourData_GetChooseFull",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -198,15 +201,16 @@ static PyObject *_wrap_wxColourData_GetChooseFull(PyObject *self, PyObject *args
 }
 
 #define wxColourData_GetColour(_swigobj)  (_swigobj->GetColour())
-static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxColourData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourData_GetColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourData_GetColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -232,16 +236,17 @@ static PyObject *_wrap_wxColourData_GetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxColourData_GetCustomColour(_swigobj,_swigarg0)  (_swigobj->GetCustomColour(_swigarg0))
-static PyObject *_wrap_wxColourData_GetCustomColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_GetCustomColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxColourData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","i", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxColourData_GetCustomColour",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxColourData_GetCustomColour",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -261,14 +266,15 @@ static PyObject *_wrap_wxColourData_GetCustomColour(PyObject *self, PyObject *ar
 }
 
 #define wxColourData_SetChooseFull(_swigobj,_swigarg0)  (_swigobj->SetChooseFull(_swigarg0))
-static PyObject *_wrap_wxColourData_SetChooseFull(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_SetChooseFull(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxColourData_SetChooseFull",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxColourData_SetChooseFull",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -288,15 +294,16 @@ static PyObject *_wrap_wxColourData_SetChooseFull(PyObject *self, PyObject *args
 }
 
 #define wxColourData_SetColour(_swigobj,_swigarg0)  (_swigobj->SetColour(_swigarg0))
-static PyObject *_wrap_wxColourData_SetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxColourData_SetColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxColourData_SetColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -323,16 +330,17 @@ static PyObject *_wrap_wxColourData_SetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxColourData_SetCustomColour(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetCustomColour(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxColourData_SetCustomColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourData_SetCustomColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _arg0;
     int  _arg1;
     wxColour * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","i","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxColourData_SetCustomColour",&_argo0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxColourData_SetCustomColour",_kwnames,&_argo0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -391,17 +399,18 @@ static void *SwigwxColourDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxColourDialog(_swigarg0,_swigarg1) (new wxColourDialog(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourDialog * _result;
     wxWindow * _arg0;
     wxColourData * _arg1 = (wxColourData *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:new_wxColourDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxColourDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -433,15 +442,16 @@ static PyObject *_wrap_new_wxColourDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxColourDialog_GetColourData(_swigobj)  (_swigobj->GetColourData())
-static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColourData * _result;
     wxColourDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourDialog_GetColourData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourDialog_GetColourData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -467,14 +477,15 @@ static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *ar
 }
 
 #define wxColourDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxColourDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxColourDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxColourDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxColourDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -525,7 +536,7 @@ static void *SwigwxDirDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _result;
     wxWindow * _arg0;
@@ -535,10 +546,11 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
     wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","message","defaultPath","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|sslO:new_wxDirDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sslO:new_wxDirDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -570,14 +582,15 @@ static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_GetPath(_swigobj)  (_swigobj->GetPath())
-static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetPath",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetPath",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -601,14 +614,15 @@ static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_GetMessage(_swigobj)  (_swigobj->GetMessage())
-static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetMessage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetMessage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -632,14 +646,15 @@ static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_GetStyle(_swigobj)  (_swigobj->GetStyle())
-static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_GetStyle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_GetStyle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -658,15 +673,16 @@ static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_SetMessage(_swigobj,_swigarg0)  (_swigobj->SetMessage(_swigarg0))
-static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","message", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxDirDialog_SetMessage",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDirDialog_SetMessage",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -697,15 +713,16 @@ static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_SetPath(_swigobj,_swigarg0)  (_swigobj->SetPath(_swigarg0))
-static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDirDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","path", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxDirDialog_SetPath",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDirDialog_SetPath",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -736,14 +753,15 @@ static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxDirDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxDirDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDirDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxDirDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDirDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDirDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -794,7 +812,7 @@ static void *SwigwxFileDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxFileDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxFileDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _result;
     wxWindow * _arg0;
@@ -806,10 +824,11 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
     wxPoint * _arg6 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","message","defaultDir","defaultFile","wildcard","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|sssslO:new_wxFileDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|sssslO:new_wxFileDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -841,14 +860,15 @@ static PyObject *_wrap_new_wxFileDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetDirectory(_swigobj)  (_swigobj->GetDirectory())
-static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetDirectory",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetDirectory",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -872,14 +892,15 @@ static PyObject *_wrap_wxFileDialog_GetDirectory(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_GetFilename(_swigobj)  (_swigobj->GetFilename())
-static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetFilename",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilename",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -903,14 +924,15 @@ static PyObject *_wrap_wxFileDialog_GetFilename(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_GetFilterIndex(_swigobj)  (_swigobj->GetFilterIndex())
-static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetFilterIndex",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetFilterIndex",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -929,14 +951,15 @@ static PyObject *_wrap_wxFileDialog_GetFilterIndex(PyObject *self, PyObject *arg
 }
 
 #define wxFileDialog_GetMessage(_swigobj)  (_swigobj->GetMessage())
-static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetMessage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetMessage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -960,14 +983,15 @@ static PyObject *_wrap_wxFileDialog_GetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetPath(_swigobj)  (_swigobj->GetPath())
-static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetPath",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetPath",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -991,14 +1015,15 @@ static PyObject *_wrap_wxFileDialog_GetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetStyle(_swigobj)  (_swigobj->GetStyle())
-static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetStyle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetStyle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1017,14 +1042,15 @@ static PyObject *_wrap_wxFileDialog_GetStyle(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_GetWildcard(_swigobj)  (_swigobj->GetWildcard())
-static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_GetWildcard",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_GetWildcard",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1048,15 +1074,16 @@ static PyObject *_wrap_wxFileDialog_GetWildcard(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_SetDirectory(_swigobj,_swigarg0)  (_swigobj->SetDirectory(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","directory", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetDirectory",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetDirectory",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1087,15 +1114,16 @@ static PyObject *_wrap_wxFileDialog_SetDirectory(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_SetFilename(_swigobj,_swigarg0)  (_swigobj->SetFilename(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","setfilename", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetFilename",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetFilename",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1126,14 +1154,15 @@ static PyObject *_wrap_wxFileDialog_SetFilename(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_SetFilterIndex(_swigobj,_swigarg0)  (_swigobj->SetFilterIndex(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","filterIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFileDialog_SetFilterIndex",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFileDialog_SetFilterIndex",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1153,15 +1182,16 @@ static PyObject *_wrap_wxFileDialog_SetFilterIndex(PyObject *self, PyObject *arg
 }
 
 #define wxFileDialog_SetMessage(_swigobj,_swigarg0)  (_swigobj->SetMessage(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","message", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetMessage",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetMessage",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1192,15 +1222,16 @@ static PyObject *_wrap_wxFileDialog_SetMessage(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_SetPath(_swigobj,_swigarg0)  (_swigobj->SetPath(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","path", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetPath",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetPath",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1231,14 +1262,15 @@ static PyObject *_wrap_wxFileDialog_SetPath(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_SetStyle(_swigobj,_swigarg0)  (_swigobj->SetStyle(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","style", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxFileDialog_SetStyle",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxFileDialog_SetStyle",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1258,15 +1290,16 @@ static PyObject *_wrap_wxFileDialog_SetStyle(PyObject *self, PyObject *args) {
 }
 
 #define wxFileDialog_SetWildcard(_swigobj,_swigarg0)  (_swigobj->SetWildcard(_swigarg0))
-static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFileDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","wildCard", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFileDialog_SetWildcard",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFileDialog_SetWildcard",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1297,14 +1330,15 @@ static PyObject *_wrap_wxFileDialog_SetWildcard(PyObject *self, PyObject *args)
 }
 
 #define wxFileDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxFileDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxFileDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFileDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFileDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1359,7 +1393,7 @@ static wxSingleChoiceDialog *new_wxSingleChoiceDialog(wxWindow *parent,wxString
                                             LCOUNT, LIST, NULL, style, *pos);
         }
 
-static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSingleChoiceDialog * _result;
     wxWindow * _arg0;
@@ -1374,10 +1408,11 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
     PyObject * _obj2 = 0;
     PyObject * _obj4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","message","caption","LIST","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOOO|lO:new_wxSingleChoiceDialog",&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO|lO:new_wxSingleChoiceDialog",_kwnames,&_argo0,&_obj1,&_obj2,&_obj4,&_arg5,&_argo6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1449,14 +1484,15 @@ static PyObject *_wrap_new_wxSingleChoiceDialog(PyObject *self, PyObject *args)
 }
 
 #define wxSingleChoiceDialog_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxSingleChoiceDialog_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1475,14 +1511,15 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetSelection(PyObject *self, PyObjec
 }
 
 #define wxSingleChoiceDialog_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1506,14 +1543,15 @@ static PyObject *_wrap_wxSingleChoiceDialog_GetStringSelection(PyObject *self, P
 }
 
 #define wxSingleChoiceDialog_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxSingleChoiceDialog_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSingleChoiceDialog * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","sel", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSingleChoiceDialog_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSingleChoiceDialog_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1533,14 +1571,15 @@ static PyObject *_wrap_wxSingleChoiceDialog_SetSelection(PyObject *self, PyObjec
 }
 
 #define wxSingleChoiceDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxSingleChoiceDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSingleChoiceDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSingleChoiceDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSingleChoiceDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSingleChoiceDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1591,7 +1630,7 @@ static void *SwigwxTextEntryDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxTextEntryDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxTextEntryDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextEntryDialog * _result;
     wxWindow * _arg0;
@@ -1602,10 +1641,11 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
     wxPoint * _arg5 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "parent","message","caption","defaultValue","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Os|sslO:new_wxTextEntryDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|sslO:new_wxTextEntryDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1637,14 +1677,15 @@ static PyObject *_wrap_new_wxTextEntryDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxTextEntryDialog_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTextEntryDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextEntryDialog_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextEntryDialog_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1668,15 +1709,16 @@ static PyObject *_wrap_wxTextEntryDialog_GetValue(PyObject *self, PyObject *args
 }
 
 #define wxTextEntryDialog_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxTextEntryDialog_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextEntryDialog_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextEntryDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextEntryDialog_SetValue",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextEntryDialog_SetValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1707,14 +1749,15 @@ static PyObject *_wrap_wxTextEntryDialog_SetValue(PyObject *self, PyObject *args
 }
 
 #define wxTextEntryDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTextEntryDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextEntryDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextEntryDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1733,13 +1776,14 @@ static PyObject *_wrap_wxTextEntryDialog_ShowModal(PyObject *self, PyObject *arg
 }
 
 #define new_wxFontData() (new wxFontData())
-static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxFontData")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxFontData",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1757,13 +1801,14 @@ static PyObject *_wrap_new_wxFontData(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxFontData(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxFontData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxFontData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1783,15 +1828,16 @@ static PyObject *_wrap_delete_wxFontData(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_EnableEffects(_swigobj,_swigarg0)  (_swigobj->EnableEffects(_swigarg0))
-static PyObject *_wrap_wxFontData_EnableEffects(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_EnableEffects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFontData_EnableEffects",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_EnableEffects",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1812,14 +1858,15 @@ static PyObject *_wrap_wxFontData_EnableEffects(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_GetAllowSymbols(_swigobj)  (_swigobj->GetAllowSymbols())
-static PyObject *_wrap_wxFontData_GetAllowSymbols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetAllowSymbols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetAllowSymbols",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetAllowSymbols",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1838,15 +1885,16 @@ static PyObject *_wrap_wxFontData_GetAllowSymbols(PyObject *self, PyObject *args
 }
 
 #define wxFontData_GetColour(_swigobj)  (_swigobj->GetColour())
-static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1872,15 +1920,16 @@ static PyObject *_wrap_wxFontData_GetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_GetChosenFont(_swigobj)  (_swigobj->GetChosenFont())
-static PyObject *_wrap_wxFontData_GetChosenFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetChosenFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetChosenFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetChosenFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1900,14 +1949,15 @@ static PyObject *_wrap_wxFontData_GetChosenFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_GetEnableEffects(_swigobj)  (_swigobj->GetEnableEffects())
-static PyObject *_wrap_wxFontData_GetEnableEffects(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetEnableEffects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetEnableEffects",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetEnableEffects",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1926,15 +1976,16 @@ static PyObject *_wrap_wxFontData_GetEnableEffects(PyObject *self, PyObject *arg
 }
 
 #define wxFontData_GetInitialFont(_swigobj)  (_swigobj->GetInitialFont())
-static PyObject *_wrap_wxFontData_GetInitialFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetInitialFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetInitialFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetInitialFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1954,14 +2005,15 @@ static PyObject *_wrap_wxFontData_GetInitialFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_GetShowHelp(_swigobj)  (_swigobj->GetShowHelp())
-static PyObject *_wrap_wxFontData_GetShowHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_GetShowHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxFontData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontData_GetShowHelp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontData_GetShowHelp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1980,15 +2032,16 @@ static PyObject *_wrap_wxFontData_GetShowHelp(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_SetAllowSymbols(_swigobj,_swigarg0)  (_swigobj->SetAllowSymbols(_swigarg0))
-static PyObject *_wrap_wxFontData_SetAllowSymbols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetAllowSymbols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","allowSymbols", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFontData_SetAllowSymbols",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_SetAllowSymbols",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2009,15 +2062,16 @@ static PyObject *_wrap_wxFontData_SetAllowSymbols(PyObject *self, PyObject *args
 }
 
 #define wxFontData_SetChosenFont(_swigobj,_swigarg0)  (_swigobj->SetChosenFont(_swigarg0))
-static PyObject *_wrap_wxFontData_SetChosenFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetChosenFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetChosenFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetChosenFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2044,15 +2098,16 @@ static PyObject *_wrap_wxFontData_SetChosenFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_SetColour(_swigobj,_swigarg0)  (_swigobj->SetColour(_swigarg0))
-static PyObject *_wrap_wxFontData_SetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2079,15 +2134,16 @@ static PyObject *_wrap_wxFontData_SetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_SetInitialFont(_swigobj,_swigarg0)  (_swigobj->SetInitialFont(_swigarg0))
-static PyObject *_wrap_wxFontData_SetInitialFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetInitialFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFontData_SetInitialFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFontData_SetInitialFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2114,15 +2170,16 @@ static PyObject *_wrap_wxFontData_SetInitialFont(PyObject *self, PyObject *args)
 }
 
 #define wxFontData_SetRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxFontData_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min","max", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxFontData_SetRange",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxFontData_SetRange",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2142,15 +2199,16 @@ static PyObject *_wrap_wxFontData_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxFontData_SetShowHelp(_swigobj,_swigarg0)  (_swigobj->SetShowHelp(_swigarg0))
-static PyObject *_wrap_wxFontData_SetShowHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontData_SetShowHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","showHelp", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFontData_SetShowHelp",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFontData_SetShowHelp",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2203,17 +2261,18 @@ static void *SwigwxFontDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxFontDialog(_swigarg0,_swigarg1) (new wxFontDialog(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontDialog * _result;
     wxWindow * _arg0;
     wxFontData * _arg1 = (wxFontData *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:new_wxFontDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxFontDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2245,15 +2304,16 @@ static PyObject *_wrap_new_wxFontDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxFontDialog_GetFontData(_swigobj)  (_swigobj->GetFontData())
-static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFontData * _result;
     wxFontDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontDialog_GetFontData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontDialog_GetFontData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2279,14 +2339,15 @@ static PyObject *_wrap_wxFontDialog_GetFontData(PyObject *self, PyObject *args)
 }
 
 #define wxFontDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxFontDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFontDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxFontDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFontDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFontDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2337,7 +2398,7 @@ static void *SwigwxMessageDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMessageDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxMessageDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMessageDialog * _result;
     wxWindow * _arg0;
@@ -2347,10 +2408,11 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
     wxPoint * _arg4 = (wxPoint *) &wxPyDefaultPosition;
     PyObject * _argo0 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","message","caption","style","pos", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Os|slO:new_wxMessageDialog",&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os|slO:new_wxMessageDialog",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2382,14 +2444,15 @@ static PyObject *_wrap_new_wxMessageDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxMessageDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxMessageDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMessageDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMessageDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMessageDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMessageDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2432,7 +2495,7 @@ static void *SwigwxProgressDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxProgressDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxProgressDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxProgressDialog * _result;
     wxString * _arg0;
@@ -2443,10 +2506,11 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "title","message","maximum","parent","style", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|iOi:new_wxProgressDialog",&_obj0,&_obj1,&_arg2,&_argo3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iOi:new_wxProgressDialog",_kwnames,&_obj0,&_obj1,&_arg2,&_argo3,&_arg4)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -2493,16 +2557,17 @@ static PyObject *_wrap_new_wxProgressDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxProgressDialog_Update(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Update(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxProgressDialog * _arg0;
     int  _arg1 = (int ) -1;
     char * _arg2 = (char *) NULL;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value","newmsg", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|is:wxProgressDialog_Update",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|is:wxProgressDialog_Update",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2521,13 +2586,14 @@ static PyObject *_wrap_wxProgressDialog_Update(PyObject *self, PyObject *args) {
 }
 
 #define wxProgressDialog_Resume(_swigobj)  (_swigobj->Resume())
-static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxProgressDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxProgressDialog_Resume",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxProgressDialog_Resume",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2547,72 +2613,72 @@ static PyObject *_wrap_wxProgressDialog_Resume(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef cmndlgscMethods[] = {
-	 { "wxProgressDialog_Resume", _wrap_wxProgressDialog_Resume, METH_VARARGS },
-	 { "wxProgressDialog_Update", _wrap_wxProgressDialog_Update, METH_VARARGS },
-	 { "new_wxProgressDialog", _wrap_new_wxProgressDialog, METH_VARARGS },
-	 { "wxMessageDialog_ShowModal", _wrap_wxMessageDialog_ShowModal, METH_VARARGS },
-	 { "new_wxMessageDialog", _wrap_new_wxMessageDialog, METH_VARARGS },
-	 { "wxFontDialog_ShowModal", _wrap_wxFontDialog_ShowModal, METH_VARARGS },
-	 { "wxFontDialog_GetFontData", _wrap_wxFontDialog_GetFontData, METH_VARARGS },
-	 { "new_wxFontDialog", _wrap_new_wxFontDialog, METH_VARARGS },
-	 { "wxFontData_SetShowHelp", _wrap_wxFontData_SetShowHelp, METH_VARARGS },
-	 { "wxFontData_SetRange", _wrap_wxFontData_SetRange, METH_VARARGS },
-	 { "wxFontData_SetInitialFont", _wrap_wxFontData_SetInitialFont, METH_VARARGS },
-	 { "wxFontData_SetColour", _wrap_wxFontData_SetColour, METH_VARARGS },
-	 { "wxFontData_SetChosenFont", _wrap_wxFontData_SetChosenFont, METH_VARARGS },
-	 { "wxFontData_SetAllowSymbols", _wrap_wxFontData_SetAllowSymbols, METH_VARARGS },
-	 { "wxFontData_GetShowHelp", _wrap_wxFontData_GetShowHelp, METH_VARARGS },
-	 { "wxFontData_GetInitialFont", _wrap_wxFontData_GetInitialFont, METH_VARARGS },
-	 { "wxFontData_GetEnableEffects", _wrap_wxFontData_GetEnableEffects, METH_VARARGS },
-	 { "wxFontData_GetChosenFont", _wrap_wxFontData_GetChosenFont, METH_VARARGS },
-	 { "wxFontData_GetColour", _wrap_wxFontData_GetColour, METH_VARARGS },
-	 { "wxFontData_GetAllowSymbols", _wrap_wxFontData_GetAllowSymbols, METH_VARARGS },
-	 { "wxFontData_EnableEffects", _wrap_wxFontData_EnableEffects, METH_VARARGS },
-	 { "delete_wxFontData", _wrap_delete_wxFontData, METH_VARARGS },
-	 { "new_wxFontData", _wrap_new_wxFontData, METH_VARARGS },
-	 { "wxTextEntryDialog_ShowModal", _wrap_wxTextEntryDialog_ShowModal, METH_VARARGS },
-	 { "wxTextEntryDialog_SetValue", _wrap_wxTextEntryDialog_SetValue, METH_VARARGS },
-	 { "wxTextEntryDialog_GetValue", _wrap_wxTextEntryDialog_GetValue, METH_VARARGS },
-	 { "new_wxTextEntryDialog", _wrap_new_wxTextEntryDialog, METH_VARARGS },
-	 { "wxSingleChoiceDialog_ShowModal", _wrap_wxSingleChoiceDialog_ShowModal, METH_VARARGS },
-	 { "wxSingleChoiceDialog_SetSelection", _wrap_wxSingleChoiceDialog_SetSelection, METH_VARARGS },
-	 { "wxSingleChoiceDialog_GetStringSelection", _wrap_wxSingleChoiceDialog_GetStringSelection, METH_VARARGS },
-	 { "wxSingleChoiceDialog_GetSelection", _wrap_wxSingleChoiceDialog_GetSelection, METH_VARARGS },
-	 { "new_wxSingleChoiceDialog", _wrap_new_wxSingleChoiceDialog, METH_VARARGS },
-	 { "wxFileDialog_ShowModal", _wrap_wxFileDialog_ShowModal, METH_VARARGS },
-	 { "wxFileDialog_SetWildcard", _wrap_wxFileDialog_SetWildcard, METH_VARARGS },
-	 { "wxFileDialog_SetStyle", _wrap_wxFileDialog_SetStyle, METH_VARARGS },
-	 { "wxFileDialog_SetPath", _wrap_wxFileDialog_SetPath, METH_VARARGS },
-	 { "wxFileDialog_SetMessage", _wrap_wxFileDialog_SetMessage, METH_VARARGS },
-	 { "wxFileDialog_SetFilterIndex", _wrap_wxFileDialog_SetFilterIndex, METH_VARARGS },
-	 { "wxFileDialog_SetFilename", _wrap_wxFileDialog_SetFilename, METH_VARARGS },
-	 { "wxFileDialog_SetDirectory", _wrap_wxFileDialog_SetDirectory, METH_VARARGS },
-	 { "wxFileDialog_GetWildcard", _wrap_wxFileDialog_GetWildcard, METH_VARARGS },
-	 { "wxFileDialog_GetStyle", _wrap_wxFileDialog_GetStyle, METH_VARARGS },
-	 { "wxFileDialog_GetPath", _wrap_wxFileDialog_GetPath, METH_VARARGS },
-	 { "wxFileDialog_GetMessage", _wrap_wxFileDialog_GetMessage, METH_VARARGS },
-	 { "wxFileDialog_GetFilterIndex", _wrap_wxFileDialog_GetFilterIndex, METH_VARARGS },
-	 { "wxFileDialog_GetFilename", _wrap_wxFileDialog_GetFilename, METH_VARARGS },
-	 { "wxFileDialog_GetDirectory", _wrap_wxFileDialog_GetDirectory, METH_VARARGS },
-	 { "new_wxFileDialog", _wrap_new_wxFileDialog, METH_VARARGS },
-	 { "wxDirDialog_ShowModal", _wrap_wxDirDialog_ShowModal, METH_VARARGS },
-	 { "wxDirDialog_SetPath", _wrap_wxDirDialog_SetPath, METH_VARARGS },
-	 { "wxDirDialog_SetMessage", _wrap_wxDirDialog_SetMessage, METH_VARARGS },
-	 { "wxDirDialog_GetStyle", _wrap_wxDirDialog_GetStyle, METH_VARARGS },
-	 { "wxDirDialog_GetMessage", _wrap_wxDirDialog_GetMessage, METH_VARARGS },
-	 { "wxDirDialog_GetPath", _wrap_wxDirDialog_GetPath, METH_VARARGS },
-	 { "new_wxDirDialog", _wrap_new_wxDirDialog, METH_VARARGS },
-	 { "wxColourDialog_ShowModal", _wrap_wxColourDialog_ShowModal, METH_VARARGS },
-	 { "wxColourDialog_GetColourData", _wrap_wxColourDialog_GetColourData, METH_VARARGS },
-	 { "new_wxColourDialog", _wrap_new_wxColourDialog, METH_VARARGS },
-	 { "wxColourData_SetCustomColour", _wrap_wxColourData_SetCustomColour, METH_VARARGS },
-	 { "wxColourData_SetColour", _wrap_wxColourData_SetColour, METH_VARARGS },
-	 { "wxColourData_SetChooseFull", _wrap_wxColourData_SetChooseFull, METH_VARARGS },
-	 { "wxColourData_GetCustomColour", _wrap_wxColourData_GetCustomColour, METH_VARARGS },
-	 { "wxColourData_GetColour", _wrap_wxColourData_GetColour, METH_VARARGS },
-	 { "wxColourData_GetChooseFull", _wrap_wxColourData_GetChooseFull, METH_VARARGS },
-	 { "delete_wxColourData", _wrap_delete_wxColourData, METH_VARARGS },
-	 { "new_wxColourData", _wrap_new_wxColourData, METH_VARARGS },
+	 { "wxProgressDialog_Resume", (PyCFunction) _wrap_wxProgressDialog_Resume, METH_VARARGS | METH_KEYWORDS },
+	 { "wxProgressDialog_Update", (PyCFunction) _wrap_wxProgressDialog_Update, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxProgressDialog", (PyCFunction) _wrap_new_wxProgressDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMessageDialog_ShowModal", (PyCFunction) _wrap_wxMessageDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxMessageDialog", (PyCFunction) _wrap_new_wxMessageDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontDialog_ShowModal", (PyCFunction) _wrap_wxFontDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontDialog_GetFontData", (PyCFunction) _wrap_wxFontDialog_GetFontData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxFontDialog", (PyCFunction) _wrap_new_wxFontDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_SetShowHelp", (PyCFunction) _wrap_wxFontData_SetShowHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_SetRange", (PyCFunction) _wrap_wxFontData_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_SetInitialFont", (PyCFunction) _wrap_wxFontData_SetInitialFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_SetColour", (PyCFunction) _wrap_wxFontData_SetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_SetChosenFont", (PyCFunction) _wrap_wxFontData_SetChosenFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_SetAllowSymbols", (PyCFunction) _wrap_wxFontData_SetAllowSymbols, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_GetShowHelp", (PyCFunction) _wrap_wxFontData_GetShowHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_GetInitialFont", (PyCFunction) _wrap_wxFontData_GetInitialFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_GetEnableEffects", (PyCFunction) _wrap_wxFontData_GetEnableEffects, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_GetChosenFont", (PyCFunction) _wrap_wxFontData_GetChosenFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_GetColour", (PyCFunction) _wrap_wxFontData_GetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_GetAllowSymbols", (PyCFunction) _wrap_wxFontData_GetAllowSymbols, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFontData_EnableEffects", (PyCFunction) _wrap_wxFontData_EnableEffects, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxFontData", (PyCFunction) _wrap_delete_wxFontData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxFontData", (PyCFunction) _wrap_new_wxFontData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextEntryDialog_ShowModal", (PyCFunction) _wrap_wxTextEntryDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextEntryDialog_SetValue", (PyCFunction) _wrap_wxTextEntryDialog_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextEntryDialog_GetValue", (PyCFunction) _wrap_wxTextEntryDialog_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxTextEntryDialog", (PyCFunction) _wrap_new_wxTextEntryDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSingleChoiceDialog_ShowModal", (PyCFunction) _wrap_wxSingleChoiceDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSingleChoiceDialog_SetSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSingleChoiceDialog_GetStringSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSingleChoiceDialog_GetSelection", (PyCFunction) _wrap_wxSingleChoiceDialog_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSingleChoiceDialog", (PyCFunction) _wrap_new_wxSingleChoiceDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_ShowModal", (PyCFunction) _wrap_wxFileDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_SetWildcard", (PyCFunction) _wrap_wxFileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_SetStyle", (PyCFunction) _wrap_wxFileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_SetPath", (PyCFunction) _wrap_wxFileDialog_SetPath, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_SetMessage", (PyCFunction) _wrap_wxFileDialog_SetMessage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_SetFilterIndex", (PyCFunction) _wrap_wxFileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_SetFilename", (PyCFunction) _wrap_wxFileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_SetDirectory", (PyCFunction) _wrap_wxFileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_GetWildcard", (PyCFunction) _wrap_wxFileDialog_GetWildcard, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_GetStyle", (PyCFunction) _wrap_wxFileDialog_GetStyle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_GetPath", (PyCFunction) _wrap_wxFileDialog_GetPath, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_GetMessage", (PyCFunction) _wrap_wxFileDialog_GetMessage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_GetFilterIndex", (PyCFunction) _wrap_wxFileDialog_GetFilterIndex, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_GetFilename", (PyCFunction) _wrap_wxFileDialog_GetFilename, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileDialog_GetDirectory", (PyCFunction) _wrap_wxFileDialog_GetDirectory, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxFileDialog", (PyCFunction) _wrap_new_wxFileDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDirDialog_ShowModal", (PyCFunction) _wrap_wxDirDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDirDialog_SetPath", (PyCFunction) _wrap_wxDirDialog_SetPath, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDirDialog_SetMessage", (PyCFunction) _wrap_wxDirDialog_SetMessage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDirDialog_GetStyle", (PyCFunction) _wrap_wxDirDialog_GetStyle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDirDialog_GetMessage", (PyCFunction) _wrap_wxDirDialog_GetMessage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDirDialog_GetPath", (PyCFunction) _wrap_wxDirDialog_GetPath, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxDirDialog", (PyCFunction) _wrap_new_wxDirDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourDialog_ShowModal", (PyCFunction) _wrap_wxColourDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourDialog_GetColourData", (PyCFunction) _wrap_wxColourDialog_GetColourData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxColourDialog", (PyCFunction) _wrap_new_wxColourDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourData_SetCustomColour", (PyCFunction) _wrap_wxColourData_SetCustomColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourData_SetColour", (PyCFunction) _wrap_wxColourData_SetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourData_SetChooseFull", (PyCFunction) _wrap_wxColourData_SetChooseFull, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourData_GetCustomColour", (PyCFunction) _wrap_wxColourData_GetCustomColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourData_GetColour", (PyCFunction) _wrap_wxColourData_GetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourData_GetChooseFull", (PyCFunction) _wrap_wxColourData_GetChooseFull, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxColourData", (PyCFunction) _wrap_delete_wxColourData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxColourData", (PyCFunction) _wrap_new_wxColourData, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp
index f75b98b5e2..04d2f2523e 100644
--- a/utils/wxPython/src/msw/controls.cpp
+++ b/utils/wxPython/src/msw/controls.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -151,15 +151,16 @@ static void *SwigwxControlTowxEvtHandler(void *ptr) {
 }
 
 #define wxControl_Command(_swigobj,_swigarg0)  (_swigobj->Command(_swigarg0))
-static PyObject *_wrap_wxControl_Command(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxControl_Command(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxControl * _arg0;
     wxCommandEvent * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","event", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxControl_Command",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxControl_Command",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -186,14 +187,15 @@ static PyObject *_wrap_wxControl_Command(PyObject *self, PyObject *args) {
 }
 
 #define wxControl_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxControl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxControl_GetLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxControl_GetLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -217,15 +219,16 @@ static PyObject *_wrap_wxControl_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxControl_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
-static PyObject *_wrap_wxControl_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxControl_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxControl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxControl_SetLabel",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxControl_SetLabel",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -280,7 +283,7 @@ static void *SwigwxButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxButton * _result;
     wxWindow * _arg0;
@@ -296,10 +299,11 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxButton",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxButton",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -356,13 +360,14 @@ static PyObject *_wrap_new_wxButton(PyObject *self, PyObject *args) {
 }
 
 #define wxButton_SetDefault(_swigobj)  (_swigobj->SetDefault())
-static PyObject *_wrap_wxButton_SetDefault(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxButton_SetDefault(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxButton_SetDefault",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxButton_SetDefault",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -414,7 +419,7 @@ static void *SwigwxBitmapButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxBitmapButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxBitmapButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _result;
     wxWindow * _arg0;
@@ -430,10 +435,11 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","bitmap","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxBitmapButton",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxBitmapButton",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -486,15 +492,16 @@ static PyObject *_wrap_new_wxBitmapButton(PyObject *self, PyObject *args) {
 }
 
 #define wxBitmapButton_GetBitmapLabel(_swigobj)  (_swigobj->GetBitmapLabel())
-static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -520,15 +527,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *a
 }
 
 #define wxBitmapButton_GetBitmapDisabled(_swigobj)  (_swigobj->GetBitmapDisabled())
-static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapDisabled",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapDisabled",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -554,15 +562,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_GetBitmapFocus(_swigobj)  (_swigobj->GetBitmapFocus())
-static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapFocus",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapFocus",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -588,15 +597,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *a
 }
 
 #define wxBitmapButton_GetBitmapSelected(_swigobj)  (_swigobj->GetBitmapSelected())
-static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxBitmapButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxBitmapButton_GetBitmapSelected",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxBitmapButton_GetBitmapSelected",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -622,15 +632,16 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_SetBitmapDisabled(_swigobj,_swigarg0)  (_swigobj->SetBitmapDisabled(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapDisabled",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapDisabled",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -657,15 +668,16 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_SetBitmapFocus(_swigobj,_swigarg0)  (_swigobj->SetBitmapFocus(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapFocus",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapFocus",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -692,15 +704,16 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *a
 }
 
 #define wxBitmapButton_SetBitmapSelected(_swigobj,_swigarg0)  (_swigobj->SetBitmapSelected(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapSelected",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapSelected",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -727,15 +740,16 @@ static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject
 }
 
 #define wxBitmapButton_SetBitmapLabel(_swigobj,_swigarg0)  (_swigobj->SetBitmapLabel(_swigarg0))
-static PyObject *_wrap_wxBitmapButton_SetBitmapLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBitmapButton_SetBitmapLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmapButton * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxBitmapButton_SetBitmapLabel",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxBitmapButton_SetBitmapLabel",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -786,7 +800,7 @@ static void *SwigwxCheckBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxCheckBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxCheckBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckBox * _result;
     wxWindow * _arg0;
@@ -802,10 +816,11 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","val","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxCheckBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxCheckBox",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -862,14 +877,15 @@ static PyObject *_wrap_new_wxCheckBox(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckBox_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxCheckBox_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckBox_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCheckBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCheckBox_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCheckBox_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -888,15 +904,16 @@ static PyObject *_wrap_wxCheckBox_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckBox_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxCheckBox_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckBox_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckBox * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","state", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxCheckBox_SetValue",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCheckBox_SetValue",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -941,7 +958,7 @@ static void *SwigwxChoiceTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxChoice(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxChoice(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
-static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _result;
     wxWindow * _arg0;
@@ -958,10 +975,11 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _obj5 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxChoice",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxChoice",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1025,15 +1043,16 @@ static PyObject *_wrap_new_wxChoice(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_Append(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
-static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxChoice_Append",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxChoice_Append",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1064,13 +1083,14 @@ static PyObject *_wrap_wxChoice_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1090,16 +1110,17 @@ static PyObject *_wrap_wxChoice_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxChoice_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxChoice_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxChoice_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1129,14 +1150,15 @@ static PyObject *_wrap_wxChoice_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetColumns(_swigobj)  (_swigobj->GetColumns())
-static PyObject *_wrap_wxChoice_GetColumns(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_GetColumns",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_GetColumns",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1155,14 +1177,15 @@ static PyObject *_wrap_wxChoice_GetColumns(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxChoice_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1181,15 +1204,16 @@ static PyObject *_wrap_wxChoice_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxChoice * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxChoice_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxChoice_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1213,14 +1237,15 @@ static PyObject *_wrap_wxChoice_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1244,14 +1269,15 @@ static PyObject *_wrap_wxChoice_GetStringSelection(PyObject *self, PyObject *arg
 }
 
 #define wxChoice_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxChoice * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxChoice_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxChoice_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1270,14 +1296,15 @@ static PyObject *_wrap_wxChoice_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_SetColumns(_swigobj,_swigarg0)  (_swigobj->SetColumns(_swigarg0))
-static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     int  _arg1 = (int ) 1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxChoice_SetColumns",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxChoice_SetColumns",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1297,14 +1324,15 @@ static PyObject *_wrap_wxChoice_SetColumns(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxChoice_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxChoice_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxChoice_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1324,15 +1352,16 @@ static PyObject *_wrap_wxChoice_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxChoice_SetStringSelection(_swigobj,_swigarg0)  (_swigobj->SetStringSelection(_swigarg0))
-static PyObject *_wrap_wxChoice_SetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxChoice_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxChoice * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxChoice_SetStringSelection",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxChoice_SetStringSelection",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1395,7 +1424,7 @@ static void *SwigwxComboBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxComboBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxComboBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
-static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _result;
     wxWindow * _arg0;
@@ -1413,10 +1442,11 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
     PyObject * _argo4 = 0;
     PyObject * _obj6 = 0;
     PyObject * _argo8 = 0;
+    char *_kwnames[] = { "parent","id","value","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|sOOOlOs:new_wxComboBox",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_obj6,&_arg7,&_argo8,&_arg9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOOlOs:new_wxComboBox",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_obj6,&_arg7,&_argo8,&_arg9)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1480,15 +1510,16 @@ static PyObject *_wrap_new_wxComboBox(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Append(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
-static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxComboBox_Append",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxComboBox_Append",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1519,13 +1550,14 @@ static PyObject *_wrap_wxComboBox_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1545,13 +1577,14 @@ static PyObject *_wrap_wxComboBox_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Copy(_swigobj)  (_swigobj->Copy())
-static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Copy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Copy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1571,13 +1604,14 @@ static PyObject *_wrap_wxComboBox_Copy(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Cut(_swigobj)  (_swigobj->Cut())
-static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Cut",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Cut",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1597,14 +1631,15 @@ static PyObject *_wrap_wxComboBox_Cut(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Delete(_swigobj,_swigarg0)  (_swigobj->Delete(_swigarg0))
-static PyObject *_wrap_wxComboBox_Delete(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_Delete",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxComboBox_Delete",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1624,16 +1659,17 @@ static PyObject *_wrap_wxComboBox_Delete(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxComboBox_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxComboBox_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxComboBox_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1663,14 +1699,15 @@ static PyObject *_wrap_wxComboBox_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_GetInsertionPoint(_swigobj)  (_swigobj->GetInsertionPoint())
-static PyObject *_wrap_wxComboBox_GetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetInsertionPoint",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetInsertionPoint",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1689,14 +1726,15 @@ static PyObject *_wrap_wxComboBox_GetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxComboBox_GetLastPosition(_swigobj)  (_swigobj->GetLastPosition())
-static PyObject *_wrap_wxComboBox_GetLastPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetLastPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetLastPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetLastPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1715,14 +1753,15 @@ static PyObject *_wrap_wxComboBox_GetLastPosition(PyObject *self, PyObject *args
 }
 
 #define wxComboBox_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxComboBox_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1741,15 +1780,16 @@ static PyObject *_wrap_wxComboBox_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxComboBox_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1773,14 +1813,15 @@ static PyObject *_wrap_wxComboBox_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1804,14 +1845,15 @@ static PyObject *_wrap_wxComboBox_GetStringSelection(PyObject *self, PyObject *a
 }
 
 #define wxComboBox_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1835,14 +1877,15 @@ static PyObject *_wrap_wxComboBox_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1861,13 +1904,14 @@ static PyObject *_wrap_wxComboBox_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Paste(_swigobj)  (_swigobj->Paste())
-static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_Paste",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_Paste",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1887,7 +1931,7 @@ static PyObject *_wrap_wxComboBox_Paste(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
@@ -1895,9 +1939,10 @@ static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args) {
     wxString * _arg3;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","from","to","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OllO:wxComboBox_Replace",&_argo0,&_arg1,&_arg2,&_obj3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO:wxComboBox_Replace",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1928,15 +1973,16 @@ static PyObject *_wrap_wxComboBox_Replace(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_Remove(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Remove(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxComboBox_Remove(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxComboBox_Remove",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxComboBox_Remove",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1956,14 +2002,15 @@ static PyObject *_wrap_wxComboBox_Remove(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_SetInsertionPoint(_swigobj,_swigarg0)  (_swigobj->SetInsertionPoint(_swigarg0))
-static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxComboBox_SetInsertionPoint",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxComboBox_SetInsertionPoint",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1983,13 +2030,14 @@ static PyObject *_wrap_wxComboBox_SetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxComboBox_SetInsertionPointEnd(_swigobj)  (_swigobj->SetInsertionPointEnd())
-static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxComboBox_SetInsertionPointEnd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxComboBox_SetInsertionPointEnd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2009,14 +2057,15 @@ static PyObject *_wrap_wxComboBox_SetInsertionPointEnd(PyObject *self, PyObject
 }
 
 #define wxComboBox_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxComboBox_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxComboBox_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2036,15 +2085,16 @@ static PyObject *_wrap_wxComboBox_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_SetMark(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxComboBox_SetMark",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxComboBox_SetMark",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2064,15 +2114,16 @@ static PyObject *_wrap_wxComboBox_SetMark(PyObject *self, PyObject *args) {
 }
 
 #define wxComboBox_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxComboBox_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxComboBox_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxComboBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxComboBox_SetValue",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxComboBox_SetValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2127,7 +2178,7 @@ static void *SwigwxGaugeTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxGauge(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxGauge(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _result;
     wxWindow * _arg0;
@@ -2142,10 +2193,11 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","range","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii|OOlOs:new_wxGauge",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|OOlOs:new_wxGauge",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2191,14 +2243,15 @@ static PyObject *_wrap_new_wxGauge(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetBezelFace(_swigobj)  (_swigobj->GetBezelFace())
-static PyObject *_wrap_wxGauge_GetBezelFace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetBezelFace",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetBezelFace",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2217,14 +2270,15 @@ static PyObject *_wrap_wxGauge_GetBezelFace(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetRange(_swigobj)  (_swigobj->GetRange())
-static PyObject *_wrap_wxGauge_GetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetRange",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetRange",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2243,14 +2297,15 @@ static PyObject *_wrap_wxGauge_GetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetShadowWidth(_swigobj)  (_swigobj->GetShadowWidth())
-static PyObject *_wrap_wxGauge_GetShadowWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetShadowWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetShadowWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetShadowWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2269,14 +2324,15 @@ static PyObject *_wrap_wxGauge_GetShadowWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGauge * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGauge_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGauge_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2295,14 +2351,15 @@ static PyObject *_wrap_wxGauge_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetBezelFace(_swigobj,_swigarg0)  (_swigobj->SetBezelFace(_swigarg0))
-static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetBezelFace",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetBezelFace",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2322,14 +2379,15 @@ static PyObject *_wrap_wxGauge_SetBezelFace(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetRange(_swigobj,_swigarg0)  (_swigobj->SetRange(_swigarg0))
-static PyObject *_wrap_wxGauge_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","range", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetRange",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetRange",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2349,14 +2407,15 @@ static PyObject *_wrap_wxGauge_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetShadowWidth(_swigobj,_swigarg0)  (_swigobj->SetShadowWidth(_swigarg0))
-static PyObject *_wrap_wxGauge_SetShadowWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetShadowWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetShadowWidth",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetShadowWidth",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2376,14 +2435,15 @@ static PyObject *_wrap_wxGauge_SetShadowWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxGauge_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxGauge_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGauge_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGauge * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGauge_SetValue",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGauge_SetValue",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2427,7 +2487,7 @@ static void *SwigwxStaticBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBox * _result;
     wxWindow * _arg0;
@@ -2441,10 +2501,11 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBox",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2518,7 +2579,7 @@ static void *SwigwxStaticLineTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticLine * _result;
     wxWindow * _arg0;
@@ -2530,10 +2591,11 @@ static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxStaticLine",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStaticLine",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2596,7 +2658,7 @@ static void *SwigwxStaticTextTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticText(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticText(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticText * _result;
     wxWindow * _arg0;
@@ -2610,10 +2672,11 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticText",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticText",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2663,14 +2726,15 @@ static PyObject *_wrap_new_wxStaticText(PyObject *self, PyObject *args) {
 }
 
 #define wxStaticText_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxStaticText * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxStaticText_GetLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStaticText_GetLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2694,15 +2758,16 @@ static PyObject *_wrap_wxStaticText_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxStaticText_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
-static PyObject *_wrap_wxStaticText_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticText_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticText * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxStaticText_SetLabel",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStaticText_SetLabel",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2757,7 +2822,7 @@ static void *SwigwxListBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
-static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _result;
     wxWindow * _arg0;
@@ -2774,10 +2839,11 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _obj5 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxListBox",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxListBox",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2841,15 +2907,16 @@ static PyObject *_wrap_new_wxListBox(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Append(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
-static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_Append",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_Append",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2880,13 +2947,14 @@ static PyObject *_wrap_wxListBox_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2906,14 +2974,15 @@ static PyObject *_wrap_wxListBox_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Delete(_swigobj,_swigarg0)  (_swigobj->Delete(_swigarg0))
-static PyObject *_wrap_wxListBox_Delete(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Delete",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_Delete",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2933,14 +3002,15 @@ static PyObject *_wrap_wxListBox_Delete(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Deselect(_swigobj,_swigarg0)  (_swigobj->Deselect(_swigarg0))
-static PyObject *_wrap_wxListBox_Deselect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Deselect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Deselect",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_Deselect",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2960,16 +3030,17 @@ static PyObject *_wrap_wxListBox_Deselect(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxListBox_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2999,14 +3070,15 @@ static PyObject *_wrap_wxListBox_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxListBox_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3033,14 +3105,15 @@ static PyObject * wxListBox_GetSelections(wxListBox *self) {
           }
           return tup;
       }
-static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_GetSelections",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_GetSelections",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3061,15 +3134,16 @@ static PyObject *_wrap_wxListBox_GetSelections(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3093,14 +3167,15 @@ static PyObject *_wrap_wxListBox_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3124,14 +3199,15 @@ static PyObject *_wrap_wxListBox_GetStringSelection(PyObject *self, PyObject *ar
 }
 
 #define wxListBox_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxListBox_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListBox_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListBox_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3150,15 +3226,16 @@ static PyObject *_wrap_wxListBox_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Selected(_swigobj,_swigarg0)  (_swigobj->Selected(_swigarg0))
-static PyObject *_wrap_wxListBox_Selected(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Selected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_Selected",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_Selected",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3177,16 +3254,17 @@ static PyObject *_wrap_wxListBox_Selected(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_Set(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Set(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","LIST", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_Set",&_argo0,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_Set",_kwnames,&_argo0,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3224,14 +3302,15 @@ static PyObject *_wrap_wxListBox_Set(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetFirstItem(_swigobj,_swigarg0)  (_swigobj->SetFirstItem(_swigarg0))
-static PyObject *_wrap_wxListBox_SetFirstItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetFirstItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListBox_SetFirstItem",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListBox_SetFirstItem",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3251,15 +3330,16 @@ static PyObject *_wrap_wxListBox_SetFirstItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetFirstItemStr(_swigobj,_swigarg0)  (_swigobj->SetFirstItem(_swigarg0))
-static PyObject *_wrap_wxListBox_SetFirstItemStr(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetFirstItemStr(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListBox_SetFirstItemStr",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListBox_SetFirstItemStr",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3290,16 +3370,17 @@ static PyObject *_wrap_wxListBox_SetFirstItemStr(PyObject *self, PyObject *args)
 }
 
 #define wxListBox_SetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     bool  _arg2 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","n","select", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|i:wxListBox_SetSelection",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|i:wxListBox_SetSelection",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3320,16 +3401,17 @@ static PyObject *_wrap_wxListBox_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetString(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_SetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","n","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxListBox_SetString",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxListBox_SetString",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3360,7 +3442,7 @@ static PyObject *_wrap_wxListBox_SetString(PyObject *self, PyObject *args) {
 }
 
 #define wxListBox_SetStringSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStringSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListBox * _arg0;
     wxString * _arg1;
@@ -3368,9 +3450,10 @@ static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *ar
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","string","select", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxListBox_SetStringSelection",&_argo0,&_obj1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxListBox_SetStringSelection",_kwnames,&_argo0,&_obj1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3434,7 +3517,7 @@ static void *SwigwxCheckListBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
-static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckListBox * _result;
     wxWindow * _arg0;
@@ -3451,10 +3534,11 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _obj5 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","LIST","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOOlOs:new_wxCheckListBox",&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOOlOs:new_wxCheckListBox",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_obj5,&_arg6,&_argo7,&_arg8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3518,15 +3602,16 @@ static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckListBox_IsChecked(_swigobj,_swigarg0)  (_swigobj->IsChecked(_swigarg0))
-static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCheckListBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","uiIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxCheckListBox_IsChecked",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCheckListBox_IsChecked",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3545,16 +3630,17 @@ static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args)
 }
 
 #define wxCheckListBox_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCheckListBox * _arg0;
     int  _arg1;
     bool  _arg2 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","uiIndex","bCheck", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|i:wxCheckListBox_Check",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|i:wxCheckListBox_Check",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3575,14 +3661,15 @@ static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args) {
 }
 
 #define wxCheckListBox_GetItemHeight(_swigobj)  (_swigobj->GetItemHeight())
-static PyObject *_wrap_wxCheckListBox_GetItemHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCheckListBox_GetItemHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxCheckListBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCheckListBox_GetItemHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCheckListBox_GetItemHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3625,7 +3712,7 @@ static void *SwigwxTextCtrlTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxTextCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxTextCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxWindow * _arg0;
@@ -3640,10 +3727,11 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","value","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|sOOlOs:new_wxTextCtrl",&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|sOOlOs:new_wxTextCtrl",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3689,13 +3777,14 @@ static PyObject *_wrap_new_wxTextCtrl(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3715,13 +3804,14 @@ static PyObject *_wrap_wxTextCtrl_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Copy(_swigobj)  (_swigobj->Copy())
-static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Copy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Copy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3741,13 +3831,14 @@ static PyObject *_wrap_wxTextCtrl_Copy(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Cut(_swigobj)  (_swigobj->Cut())
-static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Cut",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Cut",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3767,13 +3858,14 @@ static PyObject *_wrap_wxTextCtrl_Cut(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_DiscardEdits(_swigobj)  (_swigobj->DiscardEdits())
-static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_DiscardEdits",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_DiscardEdits",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3793,14 +3885,15 @@ static PyObject *_wrap_wxTextCtrl_DiscardEdits(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_GetInsertionPoint(_swigobj)  (_swigobj->GetInsertionPoint())
-static PyObject *_wrap_wxTextCtrl_GetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetInsertionPoint",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetInsertionPoint",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3819,14 +3912,15 @@ static PyObject *_wrap_wxTextCtrl_GetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxTextCtrl_GetLastPosition(_swigobj)  (_swigobj->GetLastPosition())
-static PyObject *_wrap_wxTextCtrl_GetLastPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetLastPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetLastPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetLastPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3845,15 +3939,16 @@ static PyObject *_wrap_wxTextCtrl_GetLastPosition(PyObject *self, PyObject *args
 }
 
 #define wxTextCtrl_GetLineLength(_swigobj,_swigarg0)  (_swigobj->GetLineLength(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","lineNo", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_GetLineLength",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_GetLineLength",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3872,15 +3967,16 @@ static PyObject *_wrap_wxTextCtrl_GetLineLength(PyObject *self, PyObject *args)
 }
 
 #define wxTextCtrl_GetLineText(_swigobj,_swigarg0)  (_swigobj->GetLineText(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","lineNo", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_GetLineText",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_GetLineText",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3904,14 +4000,15 @@ static PyObject *_wrap_wxTextCtrl_GetLineText(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_GetNumberOfLines(_swigobj)  (_swigobj->GetNumberOfLines())
-static PyObject *_wrap_wxTextCtrl_GetNumberOfLines(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetNumberOfLines(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetNumberOfLines",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetNumberOfLines",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3930,14 +4027,15 @@ static PyObject *_wrap_wxTextCtrl_GetNumberOfLines(PyObject *self, PyObject *arg
 }
 
 #define wxTextCtrl_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3961,14 +4059,15 @@ static PyObject *_wrap_wxTextCtrl_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_IsModified(_swigobj)  (_swigobj->IsModified())
-static PyObject *_wrap_wxTextCtrl_IsModified(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_IsModified(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_IsModified",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_IsModified",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3987,16 +4086,17 @@ static PyObject *_wrap_wxTextCtrl_IsModified(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_LoadFile(_swigobj,_swigarg0)  (_swigobj->LoadFile(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","filename", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_LoadFile",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_LoadFile",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4026,13 +4126,14 @@ static PyObject *_wrap_wxTextCtrl_LoadFile(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Paste(_swigobj)  (_swigobj->Paste())
-static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_Paste",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_Paste",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4052,7 +4153,7 @@ static PyObject *_wrap_wxTextCtrl_Paste(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_PositionToXY(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PositionToXY(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
@@ -4061,6 +4162,7 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
     long * _arg3;
     long  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
 {
@@ -4069,7 +4171,7 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_PositionToXY",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_PositionToXY",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4099,15 +4201,16 @@ static PyObject *_wrap_wxTextCtrl_PositionToXY(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Remove(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Remove(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_Remove(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Remove(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_Remove",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_Remove",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4127,7 +4230,7 @@ static PyObject *_wrap_wxTextCtrl_Remove(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
@@ -4135,9 +4238,10 @@ static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args) {
     wxString * _arg3;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","from","to","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OllO:wxTextCtrl_Replace",&_argo0,&_arg1,&_arg2,&_obj3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OllO:wxTextCtrl_Replace",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4168,16 +4272,17 @@ static PyObject *_wrap_wxTextCtrl_Replace(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SaveFile(_swigobj,_swigarg0)  (_swigobj->SaveFile(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","filename", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_SaveFile",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_SaveFile",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4207,15 +4312,16 @@ static PyObject *_wrap_wxTextCtrl_SaveFile(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SetEditable(_swigobj,_swigarg0)  (_swigobj->SetEditable(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SetEditable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","editable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxTextCtrl_SetEditable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxTextCtrl_SetEditable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4236,14 +4342,15 @@ static PyObject *_wrap_wxTextCtrl_SetEditable(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SetInsertionPoint(_swigobj,_swigarg0)  (_swigobj->SetInsertionPoint(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_SetInsertionPoint",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_SetInsertionPoint",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4263,13 +4370,14 @@ static PyObject *_wrap_wxTextCtrl_SetInsertionPoint(PyObject *self, PyObject *ar
 }
 
 #define wxTextCtrl_SetInsertionPointEnd(_swigobj)  (_swigobj->SetInsertionPointEnd())
-static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_SetInsertionPointEnd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_SetInsertionPointEnd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4289,15 +4397,16 @@ static PyObject *_wrap_wxTextCtrl_SetInsertionPointEnd(PyObject *self, PyObject
 }
 
 #define wxTextCtrl_SetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","from","to", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_SetSelection",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_SetSelection",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4317,15 +4426,16 @@ static PyObject *_wrap_wxTextCtrl_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_SetValue",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_SetValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4356,14 +4466,15 @@ static PyObject *_wrap_wxTextCtrl_SetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_ShowPosition(_swigobj,_swigarg0)  (_swigobj->ShowPosition(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_ShowPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_ShowPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxTextCtrl_ShowPosition",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxTextCtrl_ShowPosition",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4383,15 +4494,16 @@ static PyObject *_wrap_wxTextCtrl_ShowPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_WriteText(_swigobj,_swigarg0)  (_swigobj->WriteText(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_WriteText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_WriteText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_WriteText",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_WriteText",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4422,15 +4534,16 @@ static PyObject *_wrap_wxTextCtrl_WriteText(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_AppendText(_swigobj,_swigarg0)  (_swigobj->AppendText(_swigarg0))
-static PyObject *_wrap_wxTextCtrl_AppendText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_AppendText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTextCtrl_AppendText",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTextCtrl_AppendText",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4461,16 +4574,17 @@ static PyObject *_wrap_wxTextCtrl_AppendText(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_XYToPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->XYToPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxTextCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxTextCtrl_XYToPosition",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxTextCtrl_XYToPosition",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4489,14 +4603,15 @@ static PyObject *_wrap_wxTextCtrl_XYToPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanCopy(_swigobj)  (_swigobj->CanCopy())
-static PyObject *_wrap_wxTextCtrl_CanCopy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanCopy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanCopy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4515,14 +4630,15 @@ static PyObject *_wrap_wxTextCtrl_CanCopy(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanCut(_swigobj)  (_swigobj->CanCut())
-static PyObject *_wrap_wxTextCtrl_CanCut(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanCut(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanCut",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanCut",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4541,14 +4657,15 @@ static PyObject *_wrap_wxTextCtrl_CanCut(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanPaste(_swigobj)  (_swigobj->CanPaste())
-static PyObject *_wrap_wxTextCtrl_CanPaste(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanPaste(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanPaste",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanPaste",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4567,14 +4684,15 @@ static PyObject *_wrap_wxTextCtrl_CanPaste(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanRedo(_swigobj)  (_swigobj->CanRedo())
-static PyObject *_wrap_wxTextCtrl_CanRedo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanRedo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanRedo",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanRedo",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4593,14 +4711,15 @@ static PyObject *_wrap_wxTextCtrl_CanRedo(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_CanUndo(_swigobj)  (_swigobj->CanUndo())
-static PyObject *_wrap_wxTextCtrl_CanUndo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_CanUndo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_CanUndo",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_CanUndo",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4619,7 +4738,7 @@ static PyObject *_wrap_wxTextCtrl_CanUndo(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_GetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _arg0;
     long * _arg1;
@@ -4627,6 +4746,7 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
     long * _arg2;
     long  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -4635,7 +4755,7 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4665,14 +4785,15 @@ static PyObject *_wrap_wxTextCtrl_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxTextCtrl_IsEditable(_swigobj)  (_swigobj->IsEditable())
-static PyObject *_wrap_wxTextCtrl_IsEditable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTextCtrl_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTextCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTextCtrl_IsEditable",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTextCtrl_IsEditable",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4715,7 +4836,7 @@ static void *SwigwxScrollBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxScrollBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxScrollBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxWindow * _arg0;
@@ -4729,10 +4850,11 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iOOlOs:new_wxScrollBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlOs:new_wxScrollBar",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4778,14 +4900,15 @@ static PyObject *_wrap_new_wxScrollBar(PyObject *self, PyObject *args) {
 }
 
 #define wxScrollBar_GetRange(_swigobj)  (_swigobj->GetRange())
-static PyObject *_wrap_wxScrollBar_GetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetRange",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetRange",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4804,14 +4927,15 @@ static PyObject *_wrap_wxScrollBar_GetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxScrollBar_GetPageSize(_swigobj)  (_swigobj->GetPageSize())
-static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetPageSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetPageSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4830,14 +4954,15 @@ static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) {
 }
 
 #define wxScrollBar_GetThumbPosition(_swigobj)  (_swigobj->GetThumbPosition())
-static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetThumbPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetThumbPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4856,14 +4981,15 @@ static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *ar
 }
 
 #define wxScrollBar_GetThumbSize(_swigobj)  (_swigobj->GetThumbSize())
-static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollBar_GetThumbSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollBar_GetThumbSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4882,14 +5008,15 @@ static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args)
 }
 
 #define wxScrollBar_SetThumbPosition(_swigobj,_swigarg0)  (_swigobj->SetThumbPosition(_swigarg0))
-static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","viewStart", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxScrollBar_SetThumbPosition",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxScrollBar_SetThumbPosition",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4909,7 +5036,7 @@ static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *ar
 }
 
 #define wxScrollBar_SetScrollbar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetScrollbar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _arg0;
     int  _arg1;
@@ -4919,9 +5046,10 @@ static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args)
     bool  _arg5 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool5 = (int) TRUE;
+    char *_kwnames[] = { "self","position","thumbSize","range","pageSize","refresh", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiiii|i:wxScrollBar_SetScrollbar",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxScrollBar_SetScrollbar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4966,7 +5094,7 @@ static void *SwigwxSpinButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSpinButton * _result;
     wxWindow * _arg0;
@@ -4978,10 +5106,11 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iOOls:new_wxSpinButton",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxSpinButton",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5020,14 +5149,15 @@ static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_GetMax(_swigobj)  (_swigobj->GetMax())
-static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetMax",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSpinButton_GetMax",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5046,14 +5176,15 @@ static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_GetMin(_swigobj)  (_swigobj->GetMin())
-static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetMin",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSpinButton_GetMin",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5072,14 +5203,15 @@ static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSpinButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSpinButton_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSpinButton_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5098,15 +5230,16 @@ static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_SetRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSpinButton * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min","max", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSpinButton_SetRange",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSpinButton_SetRange",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5126,14 +5259,15 @@ static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxSpinButton_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxSpinButton_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSpinButton_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSpinButton * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSpinButton_SetValue",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSpinButton_SetValue",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5177,7 +5311,7 @@ static void *SwigwxStaticBitmapTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStaticBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxStaticBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBitmap * _result;
     wxWindow * _arg0;
@@ -5191,10 +5325,11 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","bitmap","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxStaticBitmap",&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxStaticBitmap",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5240,15 +5375,16 @@ static PyObject *_wrap_new_wxStaticBitmap(PyObject *self, PyObject *args) {
 }
 
 #define wxStaticBitmap_GetBitmap(_swigobj)  (_swigobj->GetBitmap())
-static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxStaticBitmap * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxStaticBitmap_GetBitmap",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStaticBitmap_GetBitmap",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5274,15 +5410,16 @@ static PyObject *_wrap_wxStaticBitmap_GetBitmap(PyObject *self, PyObject *args)
 }
 
 #define wxStaticBitmap_SetBitmap(_swigobj,_swigarg0)  (_swigobj->SetBitmap(_swigarg0))
-static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxStaticBitmap_SetBitmap",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStaticBitmap_SetBitmap",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5309,15 +5446,16 @@ static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args)
 }
 
 #define wxStaticBitmap_SetIcon(_swigobj,_swigarg0)  (_swigobj->SetIcon(_swigarg0))
-static PyObject *_wrap_wxStaticBitmap_SetIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStaticBitmap_SetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStaticBitmap * _arg0;
     wxIcon * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","icon", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxStaticBitmap_SetIcon",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStaticBitmap_SetIcon",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5368,7 +5506,7 @@ static void *SwigwxRadioBoxTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxRadioBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10) (new wxRadioBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9,_swigarg10))
-static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _result;
     wxWindow * _arg0;
@@ -5388,10 +5526,11 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
     PyObject * _argo4 = 0;
     PyObject * _obj6 = 0;
     PyObject * _argo9 = 0;
+    char *_kwnames[] = { "parent","id","label","point","size","LIST","majorDimension","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOOilOs:new_wxRadioBox",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_obj6,&_arg7,&_arg8,&_argo9,&_arg10)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOOilOs:new_wxRadioBox",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_obj6,&_arg7,&_arg8,&_argo9,&_arg10)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5466,15 +5605,16 @@ static PyObject *_wrap_new_wxRadioBox(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
-static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_Enable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_Enable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5495,16 +5635,17 @@ static PyObject *_wrap_wxRadioBox_Enable(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_EnableItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","n","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxRadioBox_EnableItem",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxRadioBox_EnableItem",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5525,16 +5666,17 @@ static PyObject *_wrap_wxRadioBox_EnableItem(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_FindString(_swigobj,_swigarg0)  (_swigobj->FindString(_swigarg0))
-static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRadioBox_FindString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRadioBox_FindString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5564,15 +5706,16 @@ static PyObject *_wrap_wxRadioBox_FindString(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetItemLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
-static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_GetItemLabel",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_GetItemLabel",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5596,14 +5739,15 @@ static PyObject *_wrap_wxRadioBox_GetItemLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxRadioBox_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioBox_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioBox_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5622,15 +5766,16 @@ static PyObject *_wrap_wxRadioBox_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetString(_swigobj,_swigarg0)  (_swigobj->GetString(_swigarg0))
-static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_GetString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_GetString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5654,14 +5799,15 @@ static PyObject *_wrap_wxRadioBox_GetString(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_GetStringSelection(_swigobj)  (_swigobj->GetStringSelection())
-static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxRadioBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioBox_GetStringSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioBox_GetStringSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5685,14 +5831,15 @@ static PyObject *_wrap_wxRadioBox_GetStringSelection(PyObject *self, PyObject *a
 }
 
 #define wxRadioBox_Number(_swigobj)  (_swigobj->Number())
-static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxRadioBox * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioBox_Number",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioBox_Number",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5711,16 +5858,17 @@ static PyObject *_wrap_wxRadioBox_Number(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_SetItemLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","n","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxRadioBox_SetItemLabel",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxRadioBox_SetItemLabel",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5751,14 +5899,15 @@ static PyObject *_wrap_wxRadioBox_SetItemLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxRadioBox_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5778,15 +5927,16 @@ static PyObject *_wrap_wxRadioBox_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_SetStringSelection(_swigobj,_swigarg0)  (_swigobj->SetStringSelection(_swigarg0))
-static PyObject *_wrap_wxRadioBox_SetStringSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_SetStringSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRadioBox_SetStringSelection",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRadioBox_SetStringSelection",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5817,15 +5967,16 @@ static PyObject *_wrap_wxRadioBox_SetStringSelection(PyObject *self, PyObject *a
 }
 
 #define wxRadioBox_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))
-static PyObject *_wrap_wxRadioBox_Show(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","show", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioBox_Show",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioBox_Show",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5846,16 +5997,17 @@ static PyObject *_wrap_wxRadioBox_Show(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioBox_ShowItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Show(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRadioBox_ShowItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioBox_ShowItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioBox * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","item","show", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxRadioBox_ShowItem",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxRadioBox_ShowItem",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5900,7 +6052,7 @@ static void *SwigwxRadioButtonTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxRadioButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7) (new wxRadioButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
-static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioButton * _result;
     wxWindow * _arg0;
@@ -5916,10 +6068,11 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "parent","id","label","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOlOs:new_wxRadioButton",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOlOs:new_wxRadioButton",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_argo6,&_arg7)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5976,14 +6129,15 @@ static PyObject *_wrap_new_wxRadioButton(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioButton_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxRadioButton_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioButton_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRadioButton * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRadioButton_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRadioButton_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6002,15 +6156,16 @@ static PyObject *_wrap_wxRadioButton_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxRadioButton_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxRadioButton_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRadioButton_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRadioButton * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxRadioButton_SetValue",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxRadioButton_SetValue",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6055,7 +6210,7 @@ static void *SwigwxSliderTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxSlider(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9) (new wxSlider(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8,_swigarg9))
-static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _result;
     wxWindow * _arg0;
@@ -6072,10 +6227,11 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
     PyObject * _argo5 = 0;
     PyObject * _argo6 = 0;
     PyObject * _argo8 = 0;
+    char *_kwnames[] = { "parent","id","value","minValue","maxValue","point","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiiii|OOlOs:new_wxSlider",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_argo6,&_arg7,&_argo8,&_arg9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|OOlOs:new_wxSlider",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_argo6,&_arg7,&_argo8,&_arg9)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6121,13 +6277,14 @@ static PyObject *_wrap_new_wxSlider(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_ClearSel(_swigobj)  (_swigobj->ClearSel())
-static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_ClearSel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_ClearSel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6147,13 +6304,14 @@ static PyObject *_wrap_wxSlider_ClearSel(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_ClearTicks(_swigobj)  (_swigobj->ClearTicks())
-static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_ClearTicks",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_ClearTicks",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6173,14 +6331,15 @@ static PyObject *_wrap_wxSlider_ClearTicks(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetLineSize(_swigobj)  (_swigobj->GetLineSize())
-static PyObject *_wrap_wxSlider_GetLineSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetLineSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetLineSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetLineSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6199,14 +6358,15 @@ static PyObject *_wrap_wxSlider_GetLineSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetMax(_swigobj)  (_swigobj->GetMax())
-static PyObject *_wrap_wxSlider_GetMax(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetMax(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetMax",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetMax",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6225,14 +6385,15 @@ static PyObject *_wrap_wxSlider_GetMax(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetMin(_swigobj)  (_swigobj->GetMin())
-static PyObject *_wrap_wxSlider_GetMin(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetMin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetMin",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetMin",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6251,14 +6412,15 @@ static PyObject *_wrap_wxSlider_GetMin(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetPageSize(_swigobj)  (_swigobj->GetPageSize())
-static PyObject *_wrap_wxSlider_GetPageSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetPageSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetPageSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6277,14 +6439,15 @@ static PyObject *_wrap_wxSlider_GetPageSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetSelEnd(_swigobj)  (_swigobj->GetSelEnd())
-static PyObject *_wrap_wxSlider_GetSelEnd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetSelEnd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetSelEnd",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetSelEnd",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6303,14 +6466,15 @@ static PyObject *_wrap_wxSlider_GetSelEnd(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetSelStart(_swigobj)  (_swigobj->GetSelStart())
-static PyObject *_wrap_wxSlider_GetSelStart(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetSelStart(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetSelStart",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetSelStart",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6329,14 +6493,15 @@ static PyObject *_wrap_wxSlider_GetSelStart(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetThumbLength(_swigobj)  (_swigobj->GetThumbLength())
-static PyObject *_wrap_wxSlider_GetThumbLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetThumbLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetThumbLength",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetThumbLength",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6355,14 +6520,15 @@ static PyObject *_wrap_wxSlider_GetThumbLength(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetTickFreq(_swigobj)  (_swigobj->GetTickFreq())
-static PyObject *_wrap_wxSlider_GetTickFreq(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetTickFreq(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetTickFreq",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetTickFreq",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6381,14 +6547,15 @@ static PyObject *_wrap_wxSlider_GetTickFreq(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_GetValue(_swigobj)  (_swigobj->GetValue())
-static PyObject *_wrap_wxSlider_GetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_GetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSlider * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSlider_GetValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSlider_GetValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6407,15 +6574,16 @@ static PyObject *_wrap_wxSlider_GetValue(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetRange(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetRange(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSlider_SetRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","minValue","maxValue", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetRange",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSlider_SetRange",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6435,15 +6603,16 @@ static PyObject *_wrap_wxSlider_SetRange(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetTickFreq(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetTickFreq(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSlider_SetTickFreq(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetTickFreq(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetTickFreq",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSlider_SetTickFreq",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6463,14 +6632,15 @@ static PyObject *_wrap_wxSlider_SetTickFreq(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetLineSize(_swigobj,_swigarg0)  (_swigobj->SetLineSize(_swigarg0))
-static PyObject *_wrap_wxSlider_SetLineSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetLineSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","lineSize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetLineSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetLineSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6490,14 +6660,15 @@ static PyObject *_wrap_wxSlider_SetLineSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetPageSize(_swigobj,_swigarg0)  (_swigobj->SetPageSize(_swigarg0))
-static PyObject *_wrap_wxSlider_SetPageSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetPageSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pageSize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetPageSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetPageSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6517,15 +6688,16 @@ static PyObject *_wrap_wxSlider_SetPageSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetSelection(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSelection(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSlider_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","startPos","endPos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSlider_SetSelection",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSlider_SetSelection",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6545,14 +6717,15 @@ static PyObject *_wrap_wxSlider_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetThumbLength(_swigobj,_swigarg0)  (_swigobj->SetThumbLength(_swigarg0))
-static PyObject *_wrap_wxSlider_SetThumbLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetThumbLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","len", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetThumbLength",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetThumbLength",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6572,14 +6745,15 @@ static PyObject *_wrap_wxSlider_SetThumbLength(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetTick(_swigobj,_swigarg0)  (_swigobj->SetTick(_swigarg0))
-static PyObject *_wrap_wxSlider_SetTick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetTick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","tickPos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetTick",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetTick",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6599,14 +6773,15 @@ static PyObject *_wrap_wxSlider_SetTick(PyObject *self, PyObject *args) {
 }
 
 #define wxSlider_SetValue(_swigobj,_swigarg0)  (_swigobj->SetValue(_swigarg0))
-static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSlider * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSlider_SetValue",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSlider_SetValue",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6626,181 +6801,181 @@ static PyObject *_wrap_wxSlider_SetValue(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef controlscMethods[] = {
-	 { "wxSlider_SetValue", _wrap_wxSlider_SetValue, METH_VARARGS },
-	 { "wxSlider_SetTick", _wrap_wxSlider_SetTick, METH_VARARGS },
-	 { "wxSlider_SetThumbLength", _wrap_wxSlider_SetThumbLength, METH_VARARGS },
-	 { "wxSlider_SetSelection", _wrap_wxSlider_SetSelection, METH_VARARGS },
-	 { "wxSlider_SetPageSize", _wrap_wxSlider_SetPageSize, METH_VARARGS },
-	 { "wxSlider_SetLineSize", _wrap_wxSlider_SetLineSize, METH_VARARGS },
-	 { "wxSlider_SetTickFreq", _wrap_wxSlider_SetTickFreq, METH_VARARGS },
-	 { "wxSlider_SetRange", _wrap_wxSlider_SetRange, METH_VARARGS },
-	 { "wxSlider_GetValue", _wrap_wxSlider_GetValue, METH_VARARGS },
-	 { "wxSlider_GetTickFreq", _wrap_wxSlider_GetTickFreq, METH_VARARGS },
-	 { "wxSlider_GetThumbLength", _wrap_wxSlider_GetThumbLength, METH_VARARGS },
-	 { "wxSlider_GetSelStart", _wrap_wxSlider_GetSelStart, METH_VARARGS },
-	 { "wxSlider_GetSelEnd", _wrap_wxSlider_GetSelEnd, METH_VARARGS },
-	 { "wxSlider_GetPageSize", _wrap_wxSlider_GetPageSize, METH_VARARGS },
-	 { "wxSlider_GetMin", _wrap_wxSlider_GetMin, METH_VARARGS },
-	 { "wxSlider_GetMax", _wrap_wxSlider_GetMax, METH_VARARGS },
-	 { "wxSlider_GetLineSize", _wrap_wxSlider_GetLineSize, METH_VARARGS },
-	 { "wxSlider_ClearTicks", _wrap_wxSlider_ClearTicks, METH_VARARGS },
-	 { "wxSlider_ClearSel", _wrap_wxSlider_ClearSel, METH_VARARGS },
-	 { "new_wxSlider", _wrap_new_wxSlider, METH_VARARGS },
-	 { "wxRadioButton_SetValue", _wrap_wxRadioButton_SetValue, METH_VARARGS },
-	 { "wxRadioButton_GetValue", _wrap_wxRadioButton_GetValue, METH_VARARGS },
-	 { "new_wxRadioButton", _wrap_new_wxRadioButton, METH_VARARGS },
-	 { "wxRadioBox_ShowItem", _wrap_wxRadioBox_ShowItem, METH_VARARGS },
-	 { "wxRadioBox_Show", _wrap_wxRadioBox_Show, METH_VARARGS },
-	 { "wxRadioBox_SetStringSelection", _wrap_wxRadioBox_SetStringSelection, METH_VARARGS },
-	 { "wxRadioBox_SetSelection", _wrap_wxRadioBox_SetSelection, METH_VARARGS },
-	 { "wxRadioBox_SetItemLabel", _wrap_wxRadioBox_SetItemLabel, METH_VARARGS },
-	 { "wxRadioBox_Number", _wrap_wxRadioBox_Number, METH_VARARGS },
-	 { "wxRadioBox_GetStringSelection", _wrap_wxRadioBox_GetStringSelection, METH_VARARGS },
-	 { "wxRadioBox_GetString", _wrap_wxRadioBox_GetString, METH_VARARGS },
-	 { "wxRadioBox_GetSelection", _wrap_wxRadioBox_GetSelection, METH_VARARGS },
-	 { "wxRadioBox_GetItemLabel", _wrap_wxRadioBox_GetItemLabel, METH_VARARGS },
-	 { "wxRadioBox_FindString", _wrap_wxRadioBox_FindString, METH_VARARGS },
-	 { "wxRadioBox_EnableItem", _wrap_wxRadioBox_EnableItem, METH_VARARGS },
-	 { "wxRadioBox_Enable", _wrap_wxRadioBox_Enable, METH_VARARGS },
-	 { "new_wxRadioBox", _wrap_new_wxRadioBox, METH_VARARGS },
-	 { "wxStaticBitmap_SetIcon", _wrap_wxStaticBitmap_SetIcon, METH_VARARGS },
-	 { "wxStaticBitmap_SetBitmap", _wrap_wxStaticBitmap_SetBitmap, METH_VARARGS },
-	 { "wxStaticBitmap_GetBitmap", _wrap_wxStaticBitmap_GetBitmap, METH_VARARGS },
-	 { "new_wxStaticBitmap", _wrap_new_wxStaticBitmap, METH_VARARGS },
-	 { "wxSpinButton_SetValue", _wrap_wxSpinButton_SetValue, METH_VARARGS },
-	 { "wxSpinButton_SetRange", _wrap_wxSpinButton_SetRange, METH_VARARGS },
-	 { "wxSpinButton_GetValue", _wrap_wxSpinButton_GetValue, METH_VARARGS },
-	 { "wxSpinButton_GetMin", _wrap_wxSpinButton_GetMin, METH_VARARGS },
-	 { "wxSpinButton_GetMax", _wrap_wxSpinButton_GetMax, METH_VARARGS },
-	 { "new_wxSpinButton", _wrap_new_wxSpinButton, METH_VARARGS },
-	 { "wxScrollBar_SetScrollbar", _wrap_wxScrollBar_SetScrollbar, METH_VARARGS },
-	 { "wxScrollBar_SetThumbPosition", _wrap_wxScrollBar_SetThumbPosition, METH_VARARGS },
-	 { "wxScrollBar_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, METH_VARARGS },
-	 { "wxScrollBar_GetThumbPosition", _wrap_wxScrollBar_GetThumbPosition, METH_VARARGS },
-	 { "wxScrollBar_GetPageSize", _wrap_wxScrollBar_GetPageSize, METH_VARARGS },
-	 { "wxScrollBar_GetRange", _wrap_wxScrollBar_GetRange, METH_VARARGS },
-	 { "new_wxScrollBar", _wrap_new_wxScrollBar, METH_VARARGS },
-	 { "wxTextCtrl_IsEditable", _wrap_wxTextCtrl_IsEditable, METH_VARARGS },
-	 { "wxTextCtrl_GetSelection", _wrap_wxTextCtrl_GetSelection, METH_VARARGS },
-	 { "wxTextCtrl_CanUndo", _wrap_wxTextCtrl_CanUndo, METH_VARARGS },
-	 { "wxTextCtrl_CanRedo", _wrap_wxTextCtrl_CanRedo, METH_VARARGS },
-	 { "wxTextCtrl_CanPaste", _wrap_wxTextCtrl_CanPaste, METH_VARARGS },
-	 { "wxTextCtrl_CanCut", _wrap_wxTextCtrl_CanCut, METH_VARARGS },
-	 { "wxTextCtrl_CanCopy", _wrap_wxTextCtrl_CanCopy, METH_VARARGS },
-	 { "wxTextCtrl_XYToPosition", _wrap_wxTextCtrl_XYToPosition, METH_VARARGS },
-	 { "wxTextCtrl_AppendText", _wrap_wxTextCtrl_AppendText, METH_VARARGS },
-	 { "wxTextCtrl_WriteText", _wrap_wxTextCtrl_WriteText, METH_VARARGS },
-	 { "wxTextCtrl_ShowPosition", _wrap_wxTextCtrl_ShowPosition, METH_VARARGS },
-	 { "wxTextCtrl_SetValue", _wrap_wxTextCtrl_SetValue, METH_VARARGS },
-	 { "wxTextCtrl_SetSelection", _wrap_wxTextCtrl_SetSelection, METH_VARARGS },
-	 { "wxTextCtrl_SetInsertionPointEnd", _wrap_wxTextCtrl_SetInsertionPointEnd, METH_VARARGS },
-	 { "wxTextCtrl_SetInsertionPoint", _wrap_wxTextCtrl_SetInsertionPoint, METH_VARARGS },
-	 { "wxTextCtrl_SetEditable", _wrap_wxTextCtrl_SetEditable, METH_VARARGS },
-	 { "wxTextCtrl_SaveFile", _wrap_wxTextCtrl_SaveFile, METH_VARARGS },
-	 { "wxTextCtrl_Replace", _wrap_wxTextCtrl_Replace, METH_VARARGS },
-	 { "wxTextCtrl_Remove", _wrap_wxTextCtrl_Remove, METH_VARARGS },
-	 { "wxTextCtrl_PositionToXY", _wrap_wxTextCtrl_PositionToXY, METH_VARARGS },
-	 { "wxTextCtrl_Paste", _wrap_wxTextCtrl_Paste, METH_VARARGS },
-	 { "wxTextCtrl_LoadFile", _wrap_wxTextCtrl_LoadFile, METH_VARARGS },
-	 { "wxTextCtrl_IsModified", _wrap_wxTextCtrl_IsModified, METH_VARARGS },
-	 { "wxTextCtrl_GetValue", _wrap_wxTextCtrl_GetValue, METH_VARARGS },
-	 { "wxTextCtrl_GetNumberOfLines", _wrap_wxTextCtrl_GetNumberOfLines, METH_VARARGS },
-	 { "wxTextCtrl_GetLineText", _wrap_wxTextCtrl_GetLineText, METH_VARARGS },
-	 { "wxTextCtrl_GetLineLength", _wrap_wxTextCtrl_GetLineLength, METH_VARARGS },
-	 { "wxTextCtrl_GetLastPosition", _wrap_wxTextCtrl_GetLastPosition, METH_VARARGS },
-	 { "wxTextCtrl_GetInsertionPoint", _wrap_wxTextCtrl_GetInsertionPoint, METH_VARARGS },
-	 { "wxTextCtrl_DiscardEdits", _wrap_wxTextCtrl_DiscardEdits, METH_VARARGS },
-	 { "wxTextCtrl_Cut", _wrap_wxTextCtrl_Cut, METH_VARARGS },
-	 { "wxTextCtrl_Copy", _wrap_wxTextCtrl_Copy, METH_VARARGS },
-	 { "wxTextCtrl_Clear", _wrap_wxTextCtrl_Clear, METH_VARARGS },
-	 { "new_wxTextCtrl", _wrap_new_wxTextCtrl, METH_VARARGS },
-	 { "wxCheckListBox_GetItemHeight", _wrap_wxCheckListBox_GetItemHeight, METH_VARARGS },
-	 { "wxCheckListBox_Check", _wrap_wxCheckListBox_Check, METH_VARARGS },
-	 { "wxCheckListBox_IsChecked", _wrap_wxCheckListBox_IsChecked, METH_VARARGS },
-	 { "new_wxCheckListBox", _wrap_new_wxCheckListBox, METH_VARARGS },
-	 { "wxListBox_SetStringSelection", _wrap_wxListBox_SetStringSelection, METH_VARARGS },
-	 { "wxListBox_SetString", _wrap_wxListBox_SetString, METH_VARARGS },
-	 { "wxListBox_SetSelection", _wrap_wxListBox_SetSelection, METH_VARARGS },
-	 { "wxListBox_SetFirstItemStr", _wrap_wxListBox_SetFirstItemStr, METH_VARARGS },
-	 { "wxListBox_SetFirstItem", _wrap_wxListBox_SetFirstItem, METH_VARARGS },
-	 { "wxListBox_Set", _wrap_wxListBox_Set, METH_VARARGS },
-	 { "wxListBox_Selected", _wrap_wxListBox_Selected, METH_VARARGS },
-	 { "wxListBox_Number", _wrap_wxListBox_Number, METH_VARARGS },
-	 { "wxListBox_GetStringSelection", _wrap_wxListBox_GetStringSelection, METH_VARARGS },
-	 { "wxListBox_GetString", _wrap_wxListBox_GetString, METH_VARARGS },
-	 { "wxListBox_GetSelections", _wrap_wxListBox_GetSelections, METH_VARARGS },
-	 { "wxListBox_GetSelection", _wrap_wxListBox_GetSelection, METH_VARARGS },
-	 { "wxListBox_FindString", _wrap_wxListBox_FindString, METH_VARARGS },
-	 { "wxListBox_Deselect", _wrap_wxListBox_Deselect, METH_VARARGS },
-	 { "wxListBox_Delete", _wrap_wxListBox_Delete, METH_VARARGS },
-	 { "wxListBox_Clear", _wrap_wxListBox_Clear, METH_VARARGS },
-	 { "wxListBox_Append", _wrap_wxListBox_Append, METH_VARARGS },
-	 { "new_wxListBox", _wrap_new_wxListBox, METH_VARARGS },
-	 { "wxStaticText_SetLabel", _wrap_wxStaticText_SetLabel, METH_VARARGS },
-	 { "wxStaticText_GetLabel", _wrap_wxStaticText_GetLabel, METH_VARARGS },
-	 { "new_wxStaticText", _wrap_new_wxStaticText, METH_VARARGS },
-	 { "new_wxStaticLine", _wrap_new_wxStaticLine, METH_VARARGS },
-	 { "new_wxStaticBox", _wrap_new_wxStaticBox, METH_VARARGS },
-	 { "wxGauge_SetValue", _wrap_wxGauge_SetValue, METH_VARARGS },
-	 { "wxGauge_SetShadowWidth", _wrap_wxGauge_SetShadowWidth, METH_VARARGS },
-	 { "wxGauge_SetRange", _wrap_wxGauge_SetRange, METH_VARARGS },
-	 { "wxGauge_SetBezelFace", _wrap_wxGauge_SetBezelFace, METH_VARARGS },
-	 { "wxGauge_GetValue", _wrap_wxGauge_GetValue, METH_VARARGS },
-	 { "wxGauge_GetShadowWidth", _wrap_wxGauge_GetShadowWidth, METH_VARARGS },
-	 { "wxGauge_GetRange", _wrap_wxGauge_GetRange, METH_VARARGS },
-	 { "wxGauge_GetBezelFace", _wrap_wxGauge_GetBezelFace, METH_VARARGS },
-	 { "new_wxGauge", _wrap_new_wxGauge, METH_VARARGS },
-	 { "wxComboBox_SetValue", _wrap_wxComboBox_SetValue, METH_VARARGS },
-	 { "wxComboBox_SetMark", _wrap_wxComboBox_SetMark, METH_VARARGS },
-	 { "wxComboBox_SetSelection", _wrap_wxComboBox_SetSelection, METH_VARARGS },
-	 { "wxComboBox_SetInsertionPointEnd", _wrap_wxComboBox_SetInsertionPointEnd, METH_VARARGS },
-	 { "wxComboBox_SetInsertionPoint", _wrap_wxComboBox_SetInsertionPoint, METH_VARARGS },
-	 { "wxComboBox_Remove", _wrap_wxComboBox_Remove, METH_VARARGS },
-	 { "wxComboBox_Replace", _wrap_wxComboBox_Replace, METH_VARARGS },
-	 { "wxComboBox_Paste", _wrap_wxComboBox_Paste, METH_VARARGS },
-	 { "wxComboBox_Number", _wrap_wxComboBox_Number, METH_VARARGS },
-	 { "wxComboBox_GetValue", _wrap_wxComboBox_GetValue, METH_VARARGS },
-	 { "wxComboBox_GetStringSelection", _wrap_wxComboBox_GetStringSelection, METH_VARARGS },
-	 { "wxComboBox_GetString", _wrap_wxComboBox_GetString, METH_VARARGS },
-	 { "wxComboBox_GetSelection", _wrap_wxComboBox_GetSelection, METH_VARARGS },
-	 { "wxComboBox_GetLastPosition", _wrap_wxComboBox_GetLastPosition, METH_VARARGS },
-	 { "wxComboBox_GetInsertionPoint", _wrap_wxComboBox_GetInsertionPoint, METH_VARARGS },
-	 { "wxComboBox_FindString", _wrap_wxComboBox_FindString, METH_VARARGS },
-	 { "wxComboBox_Delete", _wrap_wxComboBox_Delete, METH_VARARGS },
-	 { "wxComboBox_Cut", _wrap_wxComboBox_Cut, METH_VARARGS },
-	 { "wxComboBox_Copy", _wrap_wxComboBox_Copy, METH_VARARGS },
-	 { "wxComboBox_Clear", _wrap_wxComboBox_Clear, METH_VARARGS },
-	 { "wxComboBox_Append", _wrap_wxComboBox_Append, METH_VARARGS },
-	 { "new_wxComboBox", _wrap_new_wxComboBox, METH_VARARGS },
-	 { "wxChoice_SetStringSelection", _wrap_wxChoice_SetStringSelection, METH_VARARGS },
-	 { "wxChoice_SetSelection", _wrap_wxChoice_SetSelection, METH_VARARGS },
-	 { "wxChoice_SetColumns", _wrap_wxChoice_SetColumns, METH_VARARGS },
-	 { "wxChoice_Number", _wrap_wxChoice_Number, METH_VARARGS },
-	 { "wxChoice_GetStringSelection", _wrap_wxChoice_GetStringSelection, METH_VARARGS },
-	 { "wxChoice_GetString", _wrap_wxChoice_GetString, METH_VARARGS },
-	 { "wxChoice_GetSelection", _wrap_wxChoice_GetSelection, METH_VARARGS },
-	 { "wxChoice_GetColumns", _wrap_wxChoice_GetColumns, METH_VARARGS },
-	 { "wxChoice_FindString", _wrap_wxChoice_FindString, METH_VARARGS },
-	 { "wxChoice_Clear", _wrap_wxChoice_Clear, METH_VARARGS },
-	 { "wxChoice_Append", _wrap_wxChoice_Append, METH_VARARGS },
-	 { "new_wxChoice", _wrap_new_wxChoice, METH_VARARGS },
-	 { "wxCheckBox_SetValue", _wrap_wxCheckBox_SetValue, METH_VARARGS },
-	 { "wxCheckBox_GetValue", _wrap_wxCheckBox_GetValue, METH_VARARGS },
-	 { "new_wxCheckBox", _wrap_new_wxCheckBox, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapLabel", _wrap_wxBitmapButton_SetBitmapLabel, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapSelected", _wrap_wxBitmapButton_SetBitmapSelected, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapFocus", _wrap_wxBitmapButton_SetBitmapFocus, METH_VARARGS },
-	 { "wxBitmapButton_SetBitmapDisabled", _wrap_wxBitmapButton_SetBitmapDisabled, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapSelected", _wrap_wxBitmapButton_GetBitmapSelected, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapFocus", _wrap_wxBitmapButton_GetBitmapFocus, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapDisabled", _wrap_wxBitmapButton_GetBitmapDisabled, METH_VARARGS },
-	 { "wxBitmapButton_GetBitmapLabel", _wrap_wxBitmapButton_GetBitmapLabel, METH_VARARGS },
-	 { "new_wxBitmapButton", _wrap_new_wxBitmapButton, METH_VARARGS },
-	 { "wxButton_SetDefault", _wrap_wxButton_SetDefault, METH_VARARGS },
-	 { "new_wxButton", _wrap_new_wxButton, METH_VARARGS },
-	 { "wxControl_SetLabel", _wrap_wxControl_SetLabel, METH_VARARGS },
-	 { "wxControl_GetLabel", _wrap_wxControl_GetLabel, METH_VARARGS },
-	 { "wxControl_Command", _wrap_wxControl_Command, METH_VARARGS },
+	 { "wxSlider_SetValue", (PyCFunction) _wrap_wxSlider_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetTick", (PyCFunction) _wrap_wxSlider_SetTick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetThumbLength", (PyCFunction) _wrap_wxSlider_SetThumbLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetSelection", (PyCFunction) _wrap_wxSlider_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetPageSize", (PyCFunction) _wrap_wxSlider_SetPageSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetLineSize", (PyCFunction) _wrap_wxSlider_SetLineSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetTickFreq", (PyCFunction) _wrap_wxSlider_SetTickFreq, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_SetRange", (PyCFunction) _wrap_wxSlider_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetValue", (PyCFunction) _wrap_wxSlider_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetTickFreq", (PyCFunction) _wrap_wxSlider_GetTickFreq, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetThumbLength", (PyCFunction) _wrap_wxSlider_GetThumbLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetSelStart", (PyCFunction) _wrap_wxSlider_GetSelStart, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetSelEnd", (PyCFunction) _wrap_wxSlider_GetSelEnd, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetPageSize", (PyCFunction) _wrap_wxSlider_GetPageSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetMin", (PyCFunction) _wrap_wxSlider_GetMin, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetMax", (PyCFunction) _wrap_wxSlider_GetMax, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_GetLineSize", (PyCFunction) _wrap_wxSlider_GetLineSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_ClearTicks", (PyCFunction) _wrap_wxSlider_ClearTicks, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSlider_ClearSel", (PyCFunction) _wrap_wxSlider_ClearSel, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSlider", (PyCFunction) _wrap_new_wxSlider, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioButton_SetValue", (PyCFunction) _wrap_wxRadioButton_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioButton_GetValue", (PyCFunction) _wrap_wxRadioButton_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRadioButton", (PyCFunction) _wrap_new_wxRadioButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_ShowItem", (PyCFunction) _wrap_wxRadioBox_ShowItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_Show", (PyCFunction) _wrap_wxRadioBox_Show, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_SetStringSelection", (PyCFunction) _wrap_wxRadioBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_SetSelection", (PyCFunction) _wrap_wxRadioBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_SetItemLabel", (PyCFunction) _wrap_wxRadioBox_SetItemLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_Number", (PyCFunction) _wrap_wxRadioBox_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetStringSelection", (PyCFunction) _wrap_wxRadioBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetString", (PyCFunction) _wrap_wxRadioBox_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetSelection", (PyCFunction) _wrap_wxRadioBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_GetItemLabel", (PyCFunction) _wrap_wxRadioBox_GetItemLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_FindString", (PyCFunction) _wrap_wxRadioBox_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_EnableItem", (PyCFunction) _wrap_wxRadioBox_EnableItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRadioBox_Enable", (PyCFunction) _wrap_wxRadioBox_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRadioBox", (PyCFunction) _wrap_new_wxRadioBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticBitmap_SetIcon", (PyCFunction) _wrap_wxStaticBitmap_SetIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticBitmap_SetBitmap", (PyCFunction) _wrap_wxStaticBitmap_SetBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticBitmap_GetBitmap", (PyCFunction) _wrap_wxStaticBitmap_GetBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticBitmap", (PyCFunction) _wrap_new_wxStaticBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_SetValue", (PyCFunction) _wrap_wxSpinButton_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_SetRange", (PyCFunction) _wrap_wxSpinButton_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_GetValue", (PyCFunction) _wrap_wxSpinButton_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_GetMin", (PyCFunction) _wrap_wxSpinButton_GetMin, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSpinButton_GetMax", (PyCFunction) _wrap_wxSpinButton_GetMax, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSpinButton", (PyCFunction) _wrap_new_wxSpinButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_SetScrollbar", (PyCFunction) _wrap_wxScrollBar_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_SetThumbPosition", (PyCFunction) _wrap_wxScrollBar_SetThumbPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetThumbSize", (PyCFunction) _wrap_wxScrollBar_GetThumbSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetThumbPosition", (PyCFunction) _wrap_wxScrollBar_GetThumbPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetPageSize", (PyCFunction) _wrap_wxScrollBar_GetPageSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollBar_GetRange", (PyCFunction) _wrap_wxScrollBar_GetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxScrollBar", (PyCFunction) _wrap_new_wxScrollBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_IsEditable", (PyCFunction) _wrap_wxTextCtrl_IsEditable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetSelection", (PyCFunction) _wrap_wxTextCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanUndo", (PyCFunction) _wrap_wxTextCtrl_CanUndo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanRedo", (PyCFunction) _wrap_wxTextCtrl_CanRedo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanPaste", (PyCFunction) _wrap_wxTextCtrl_CanPaste, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanCut", (PyCFunction) _wrap_wxTextCtrl_CanCut, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_CanCopy", (PyCFunction) _wrap_wxTextCtrl_CanCopy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_XYToPosition", (PyCFunction) _wrap_wxTextCtrl_XYToPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_AppendText", (PyCFunction) _wrap_wxTextCtrl_AppendText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_WriteText", (PyCFunction) _wrap_wxTextCtrl_WriteText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_ShowPosition", (PyCFunction) _wrap_wxTextCtrl_ShowPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetValue", (PyCFunction) _wrap_wxTextCtrl_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetSelection", (PyCFunction) _wrap_wxTextCtrl_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetInsertionPointEnd", (PyCFunction) _wrap_wxTextCtrl_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetInsertionPoint", (PyCFunction) _wrap_wxTextCtrl_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SetEditable", (PyCFunction) _wrap_wxTextCtrl_SetEditable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_SaveFile", (PyCFunction) _wrap_wxTextCtrl_SaveFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Replace", (PyCFunction) _wrap_wxTextCtrl_Replace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Remove", (PyCFunction) _wrap_wxTextCtrl_Remove, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_PositionToXY", (PyCFunction) _wrap_wxTextCtrl_PositionToXY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Paste", (PyCFunction) _wrap_wxTextCtrl_Paste, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_LoadFile", (PyCFunction) _wrap_wxTextCtrl_LoadFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_IsModified", (PyCFunction) _wrap_wxTextCtrl_IsModified, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetValue", (PyCFunction) _wrap_wxTextCtrl_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetNumberOfLines", (PyCFunction) _wrap_wxTextCtrl_GetNumberOfLines, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetLineText", (PyCFunction) _wrap_wxTextCtrl_GetLineText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetLineLength", (PyCFunction) _wrap_wxTextCtrl_GetLineLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetLastPosition", (PyCFunction) _wrap_wxTextCtrl_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_GetInsertionPoint", (PyCFunction) _wrap_wxTextCtrl_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_DiscardEdits", (PyCFunction) _wrap_wxTextCtrl_DiscardEdits, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Cut", (PyCFunction) _wrap_wxTextCtrl_Cut, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Copy", (PyCFunction) _wrap_wxTextCtrl_Copy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTextCtrl_Clear", (PyCFunction) _wrap_wxTextCtrl_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxTextCtrl", (PyCFunction) _wrap_new_wxTextCtrl, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckListBox_GetItemHeight", (PyCFunction) _wrap_wxCheckListBox_GetItemHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckListBox_Check", (PyCFunction) _wrap_wxCheckListBox_Check, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckListBox_IsChecked", (PyCFunction) _wrap_wxCheckListBox_IsChecked, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxCheckListBox", (PyCFunction) _wrap_new_wxCheckListBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetStringSelection", (PyCFunction) _wrap_wxListBox_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetString", (PyCFunction) _wrap_wxListBox_SetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetSelection", (PyCFunction) _wrap_wxListBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetFirstItemStr", (PyCFunction) _wrap_wxListBox_SetFirstItemStr, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_SetFirstItem", (PyCFunction) _wrap_wxListBox_SetFirstItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Set", (PyCFunction) _wrap_wxListBox_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Selected", (PyCFunction) _wrap_wxListBox_Selected, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Number", (PyCFunction) _wrap_wxListBox_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetStringSelection", (PyCFunction) _wrap_wxListBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetString", (PyCFunction) _wrap_wxListBox_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetSelections", (PyCFunction) _wrap_wxListBox_GetSelections, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_GetSelection", (PyCFunction) _wrap_wxListBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_FindString", (PyCFunction) _wrap_wxListBox_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Deselect", (PyCFunction) _wrap_wxListBox_Deselect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Delete", (PyCFunction) _wrap_wxListBox_Delete, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Clear", (PyCFunction) _wrap_wxListBox_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListBox_Append", (PyCFunction) _wrap_wxListBox_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxListBox", (PyCFunction) _wrap_new_wxListBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticText_SetLabel", (PyCFunction) _wrap_wxStaticText_SetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStaticText_GetLabel", (PyCFunction) _wrap_wxStaticText_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticText", (PyCFunction) _wrap_new_wxStaticText, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticLine", (PyCFunction) _wrap_new_wxStaticLine, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStaticBox", (PyCFunction) _wrap_new_wxStaticBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetValue", (PyCFunction) _wrap_wxGauge_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetShadowWidth", (PyCFunction) _wrap_wxGauge_SetShadowWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetRange", (PyCFunction) _wrap_wxGauge_SetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_SetBezelFace", (PyCFunction) _wrap_wxGauge_SetBezelFace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetValue", (PyCFunction) _wrap_wxGauge_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetShadowWidth", (PyCFunction) _wrap_wxGauge_GetShadowWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetRange", (PyCFunction) _wrap_wxGauge_GetRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGauge_GetBezelFace", (PyCFunction) _wrap_wxGauge_GetBezelFace, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxGauge", (PyCFunction) _wrap_new_wxGauge, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetValue", (PyCFunction) _wrap_wxComboBox_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetMark", (PyCFunction) _wrap_wxComboBox_SetMark, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetSelection", (PyCFunction) _wrap_wxComboBox_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetInsertionPointEnd", (PyCFunction) _wrap_wxComboBox_SetInsertionPointEnd, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_SetInsertionPoint", (PyCFunction) _wrap_wxComboBox_SetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Remove", (PyCFunction) _wrap_wxComboBox_Remove, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Replace", (PyCFunction) _wrap_wxComboBox_Replace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Paste", (PyCFunction) _wrap_wxComboBox_Paste, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Number", (PyCFunction) _wrap_wxComboBox_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetValue", (PyCFunction) _wrap_wxComboBox_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetStringSelection", (PyCFunction) _wrap_wxComboBox_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetString", (PyCFunction) _wrap_wxComboBox_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetSelection", (PyCFunction) _wrap_wxComboBox_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetLastPosition", (PyCFunction) _wrap_wxComboBox_GetLastPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_GetInsertionPoint", (PyCFunction) _wrap_wxComboBox_GetInsertionPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_FindString", (PyCFunction) _wrap_wxComboBox_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Delete", (PyCFunction) _wrap_wxComboBox_Delete, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Cut", (PyCFunction) _wrap_wxComboBox_Cut, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Copy", (PyCFunction) _wrap_wxComboBox_Copy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Clear", (PyCFunction) _wrap_wxComboBox_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "wxComboBox_Append", (PyCFunction) _wrap_wxComboBox_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxComboBox", (PyCFunction) _wrap_new_wxComboBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_SetStringSelection", (PyCFunction) _wrap_wxChoice_SetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_SetSelection", (PyCFunction) _wrap_wxChoice_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_SetColumns", (PyCFunction) _wrap_wxChoice_SetColumns, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_Number", (PyCFunction) _wrap_wxChoice_Number, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetStringSelection", (PyCFunction) _wrap_wxChoice_GetStringSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetString", (PyCFunction) _wrap_wxChoice_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetSelection", (PyCFunction) _wrap_wxChoice_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_GetColumns", (PyCFunction) _wrap_wxChoice_GetColumns, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_FindString", (PyCFunction) _wrap_wxChoice_FindString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_Clear", (PyCFunction) _wrap_wxChoice_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "wxChoice_Append", (PyCFunction) _wrap_wxChoice_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxChoice", (PyCFunction) _wrap_new_wxChoice, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckBox_SetValue", (PyCFunction) _wrap_wxCheckBox_SetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCheckBox_GetValue", (PyCFunction) _wrap_wxCheckBox_GetValue, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxCheckBox", (PyCFunction) _wrap_new_wxCheckBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapLabel", (PyCFunction) _wrap_wxBitmapButton_SetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapSelected", (PyCFunction) _wrap_wxBitmapButton_SetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapFocus", (PyCFunction) _wrap_wxBitmapButton_SetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_SetBitmapDisabled", (PyCFunction) _wrap_wxBitmapButton_SetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapSelected", (PyCFunction) _wrap_wxBitmapButton_GetBitmapSelected, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapFocus", (PyCFunction) _wrap_wxBitmapButton_GetBitmapFocus, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_wxBitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBitmapButton_GetBitmapLabel", (PyCFunction) _wrap_wxBitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxBitmapButton", (PyCFunction) _wrap_new_wxBitmapButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxButton_SetDefault", (PyCFunction) _wrap_wxButton_SetDefault, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxButton", (PyCFunction) _wrap_new_wxButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxControl_SetLabel", (PyCFunction) _wrap_wxControl_SetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxControl_GetLabel", (PyCFunction) _wrap_wxControl_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxControl_Command", (PyCFunction) _wrap_wxControl_Command, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp
index 1e8dadad0d..c0919089f7 100644
--- a/utils/wxPython/src/msw/controls2.cpp
+++ b/utils/wxPython/src/msw/controls2.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -155,15 +155,16 @@ public:
 extern "C" {
 #endif
 #define wxListItem_m_mask_set(_swigobj,_swigval) (_swigobj->m_mask = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_mask_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_mask_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_mask_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListItem_m_mask_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -182,14 +183,15 @@ static PyObject *_wrap_wxListItem_m_mask_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_mask_get(_swigobj) ((long ) _swigobj->m_mask)
-static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_mask_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_mask_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -208,15 +210,16 @@ static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_itemId_set(_swigobj,_swigval) (_swigobj->m_itemId = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_itemId_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_itemId_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_itemId", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_itemId_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListItem_m_itemId_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -235,14 +238,15 @@ static PyObject *_wrap_wxListItem_m_itemId_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_itemId_get(_swigobj) ((long ) _swigobj->m_itemId)
-static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_itemId_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_itemId_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -261,15 +265,16 @@ static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_col_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_col_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_col_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListItem_m_col_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -288,14 +293,15 @@ static PyObject *_wrap_wxListItem_m_col_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_col_get(_swigobj) ((int ) _swigobj->m_col)
-static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_col_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_col_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -314,15 +320,16 @@ static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_state_set(_swigobj,_swigval) (_swigobj->m_state = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_state_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_state_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_state", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_state_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListItem_m_state_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -341,14 +348,15 @@ static PyObject *_wrap_wxListItem_m_state_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_state_get(_swigobj) ((long ) _swigobj->m_state)
-static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_state_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_state_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -367,15 +375,16 @@ static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_stateMask_set(_swigobj,_swigval) (_swigobj->m_stateMask = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_stateMask_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_stateMask_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_stateMask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_stateMask_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListItem_m_stateMask_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -394,14 +403,15 @@ static PyObject *_wrap_wxListItem_m_stateMask_set(PyObject *self, PyObject *args
 }
 
 #define wxListItem_m_stateMask_get(_swigobj) ((long ) _swigobj->m_stateMask)
-static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_stateMask_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_stateMask_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -420,16 +430,17 @@ static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args
 }
 
 #define wxListItem_m_text_set(_swigobj,_swigval) (_swigobj->m_text = *(_swigval),_swigval)
-static PyObject *_wrap_wxListItem_m_text_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_text_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxListItem * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","m_text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListItem_m_text_set",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListItem_m_text_set",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -461,14 +472,15 @@ static PyObject *_wrap_wxListItem_m_text_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_text_get(_swigobj) (&_swigobj->m_text)
-static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_text_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_text_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -489,15 +501,16 @@ static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_image_set(_swigobj,_swigval) (_swigobj->m_image = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_image_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_image_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_image", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_image_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListItem_m_image_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -516,14 +529,15 @@ static PyObject *_wrap_wxListItem_m_image_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_image_get(_swigobj) ((int ) _swigobj->m_image)
-static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_image_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_image_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -542,15 +556,16 @@ static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_data_set(_swigobj,_swigval) (_swigobj->m_data = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_data_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_data_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_data", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListItem_m_data_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListItem_m_data_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -569,14 +584,15 @@ static PyObject *_wrap_wxListItem_m_data_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_data_get(_swigobj) ((long ) _swigobj->m_data)
-static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_data_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_data_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -595,15 +611,16 @@ static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_format_set(_swigobj,_swigval) (_swigobj->m_format = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_format_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_format_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_format", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_format_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListItem_m_format_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -622,14 +639,15 @@ static PyObject *_wrap_wxListItem_m_format_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_format_get(_swigobj) ((int ) _swigobj->m_format)
-static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_format_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_format_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -648,15 +666,16 @@ static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_width_set(_swigobj,_swigval) (_swigobj->m_width = _swigval,_swigval)
-static PyObject *_wrap_wxListItem_m_width_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListItem_m_width_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListItem_m_width_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -675,14 +694,15 @@ static PyObject *_wrap_wxListItem_m_width_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListItem_m_width_get(_swigobj) ((int ) _swigobj->m_width)
-static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListItem_m_width_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListItem_m_width_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -701,13 +721,14 @@ static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args) {
 }
 
 #define new_wxListItem() (new wxListItem())
-static PyObject *_wrap_new_wxListItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListItem * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxListItem")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxListItem",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -725,13 +746,14 @@ static PyObject *_wrap_new_wxListItem(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxListItem(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxListItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxListItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxListItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxListItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -767,15 +789,16 @@ static void *SwigwxListEventTowxEvent(void *ptr) {
 }
 
 #define wxListEvent_m_code_set(_swigobj,_swigval) (_swigobj->m_code = _swigval,_swigval)
-static PyObject *_wrap_wxListEvent_m_code_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_code_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_code", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListEvent_m_code_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListEvent_m_code_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -794,14 +817,15 @@ static PyObject *_wrap_wxListEvent_m_code_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListEvent_m_code_get(_swigobj) ((int ) _swigobj->m_code)
-static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_code_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_code_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -820,15 +844,16 @@ static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListEvent_m_itemIndex_set(_swigobj,_swigval) (_swigobj->m_itemIndex = _swigval,_swigval)
-static PyObject *_wrap_wxListEvent_m_itemIndex_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_itemIndex_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_itemIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListEvent_m_itemIndex_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListEvent_m_itemIndex_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -847,14 +872,15 @@ static PyObject *_wrap_wxListEvent_m_itemIndex_set(PyObject *self, PyObject *arg
 }
 
 #define wxListEvent_m_itemIndex_get(_swigobj) ((long ) _swigobj->m_itemIndex)
-static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_itemIndex_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_itemIndex_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -873,15 +899,16 @@ static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *arg
 }
 
 #define wxListEvent_m_oldItemIndex_set(_swigobj,_swigval) (_swigobj->m_oldItemIndex = _swigval,_swigval)
-static PyObject *_wrap_wxListEvent_m_oldItemIndex_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_oldItemIndex_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_oldItemIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListEvent_m_oldItemIndex_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListEvent_m_oldItemIndex_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -900,14 +927,15 @@ static PyObject *_wrap_wxListEvent_m_oldItemIndex_set(PyObject *self, PyObject *
 }
 
 #define wxListEvent_m_oldItemIndex_get(_swigobj) ((long ) _swigobj->m_oldItemIndex)
-static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_oldItemIndex_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_oldItemIndex_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -926,15 +954,16 @@ static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *
 }
 
 #define wxListEvent_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval)
-static PyObject *_wrap_wxListEvent_m_col_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_col_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListEvent_m_col_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListEvent_m_col_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -953,14 +982,15 @@ static PyObject *_wrap_wxListEvent_m_col_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col)
-static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_col_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_col_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -979,16 +1009,17 @@ static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) {
 }
 
 #define wxListEvent_m_cancelled_set(_swigobj,_swigval) (_swigobj->m_cancelled = _swigval,_swigval)
-static PyObject *_wrap_wxListEvent_m_cancelled_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_cancelled_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_cancelled", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListEvent_m_cancelled_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListEvent_m_cancelled_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1008,14 +1039,15 @@ static PyObject *_wrap_wxListEvent_m_cancelled_set(PyObject *self, PyObject *arg
 }
 
 #define wxListEvent_m_cancelled_get(_swigobj) ((bool ) _swigobj->m_cancelled)
-static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_cancelled_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_cancelled_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1034,17 +1066,18 @@ static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *arg
 }
 
 #define wxListEvent_m_pointDrag_set(_swigobj,_swigval) (_swigobj->m_pointDrag = *(_swigval),_swigval)
-static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxListEvent * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","m_pointDrag", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListEvent_m_pointDrag_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListEvent_m_pointDrag_set",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1076,15 +1109,16 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *arg
 }
 
 #define wxListEvent_m_pointDrag_get(_swigobj) (&_swigobj->m_pointDrag)
-static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxListEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_pointDrag_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_pointDrag_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1109,17 +1143,18 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *arg
 }
 
 #define wxListEvent_m_item_set(_swigobj,_swigval) (_swigobj->m_item = *(_swigval),_swigval)
-static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListItem * _result;
     wxListEvent * _arg0;
     wxListItem * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","m_item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListEvent_m_item_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListEvent_m_item_set",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1151,15 +1186,16 @@ static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args) {
 }
 
 #define wxListEvent_m_item_get(_swigobj) (&_swigobj->m_item)
-static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListItem * _result;
     wxListEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListEvent_m_item_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListEvent_m_item_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1208,7 +1244,7 @@ static void *SwigwxListCtrlTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxListCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxListCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _result;
     wxWindow * _arg0;
@@ -1222,10 +1258,11 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOlOs:new_wxListCtrl",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlOs:new_wxListCtrl",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1271,15 +1308,16 @@ static PyObject *_wrap_new_wxListCtrl(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_Arrange(_swigobj,_swigarg0)  (_swigobj->Arrange(_swigarg0))
-static PyObject *_wrap_wxListCtrl_Arrange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_Arrange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     int  _arg1 = (int ) (wxLIST_ALIGN_DEFAULT);
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxListCtrl_Arrange",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxListCtrl_Arrange",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1298,15 +1336,16 @@ static PyObject *_wrap_wxListCtrl_Arrange(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_DeleteItem(_swigobj,_swigarg0)  (_swigobj->DeleteItem(_swigarg0))
-static PyObject *_wrap_wxListCtrl_DeleteItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_DeleteItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_DeleteItem",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_DeleteItem",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1325,14 +1364,15 @@ static PyObject *_wrap_wxListCtrl_DeleteItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_DeleteAllItems(_swigobj)  (_swigobj->DeleteAllItems())
-static PyObject *_wrap_wxListCtrl_DeleteAllItems(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_DeleteAllItems(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_DeleteAllItems",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_DeleteAllItems",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1351,15 +1391,16 @@ static PyObject *_wrap_wxListCtrl_DeleteAllItems(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_DeleteColumn(_swigobj,_swigarg0)  (_swigobj->DeleteColumn(_swigarg0))
-static PyObject *_wrap_wxListCtrl_DeleteColumn(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_DeleteColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_DeleteColumn",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_DeleteColumn",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1378,14 +1419,15 @@ static PyObject *_wrap_wxListCtrl_DeleteColumn(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_DeleteAllColumns(_swigobj)  (_swigobj->DeleteAllColumns())
-static PyObject *_wrap_wxListCtrl_DeleteAllColumns(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_DeleteAllColumns(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_DeleteAllColumns",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_DeleteAllColumns",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1404,13 +1446,14 @@ static PyObject *_wrap_wxListCtrl_DeleteAllColumns(PyObject *self, PyObject *arg
 }
 
 #define wxListCtrl_ClearAll(_swigobj)  (_swigobj->ClearAll())
-static PyObject *_wrap_wxListCtrl_ClearAll(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_ClearAll(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_ClearAll",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_ClearAll",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1430,16 +1473,17 @@ static PyObject *_wrap_wxListCtrl_ClearAll(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_EditLabel(_swigobj,_swigarg0)  (_swigobj->EditLabel(_swigarg0))
-static PyObject *_wrap_wxListCtrl_EditLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_EditLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_EditLabel",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_EditLabel",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1464,16 +1508,17 @@ static PyObject *_wrap_wxListCtrl_EditLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_EndEditLabel(_swigobj,_swigarg0)  (_swigobj->EndEditLabel(_swigarg0))
-static PyObject *_wrap_wxListCtrl_EndEditLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_EndEditLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","cancel", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_EndEditLabel",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_EndEditLabel",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1493,15 +1538,16 @@ static PyObject *_wrap_wxListCtrl_EndEditLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetEditControl(_swigobj)  (_swigobj->GetEditControl())
-static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetEditControl",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetEditControl",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1526,15 +1572,16 @@ static PyObject *_wrap_wxListCtrl_GetEditControl(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_EnsureVisible(_swigobj,_swigarg0)  (_swigobj->EnsureVisible(_swigarg0))
-static PyObject *_wrap_wxListCtrl_EnsureVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_EnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_EnsureVisible",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_EnsureVisible",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1553,7 +1600,7 @@ static PyObject *_wrap_wxListCtrl_EnsureVisible(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_FindItem(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->FindItem(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxListCtrl_FindItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_FindItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -1563,9 +1610,10 @@ static PyObject *_wrap_wxListCtrl_FindItem(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     int tempbool3 = (int) FALSE;
+    char *_kwnames[] = { "self","start","str","partial", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlO|i:wxListCtrl_FindItem",&_argo0,&_arg1,&_obj2,&tempbool3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO|i:wxListCtrl_FindItem",_kwnames,&_argo0,&_arg1,&_obj2,&tempbool3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1596,16 +1644,17 @@ static PyObject *_wrap_wxListCtrl_FindItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_FindItemData(_swigobj,_swigarg0,_swigarg1)  (_swigobj->FindItem(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_FindItemData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_FindItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","start","data", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxListCtrl_FindItemData",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxListCtrl_FindItemData",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1624,7 +1673,7 @@ static PyObject *_wrap_wxListCtrl_FindItemData(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_FindItemAtPos(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->FindItem(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxListCtrl_FindItemAtPos(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_FindItemAtPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -1633,9 +1682,10 @@ static PyObject *_wrap_wxListCtrl_FindItemAtPos(PyObject *self, PyObject *args)
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","start","pt","direction", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlOi:wxListCtrl_FindItemAtPos",&_argo0,&_arg1,&_argo2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlOi:wxListCtrl_FindItemAtPos",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1661,7 +1711,7 @@ static PyObject *_wrap_wxListCtrl_FindItemAtPos(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_GetColumn(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetColumn(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_GetColumn(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
@@ -1669,9 +1719,10 @@ static PyObject *_wrap_wxListCtrl_GetColumn(PyObject *self, PyObject *args) {
     wxListItem * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","col","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxListCtrl_GetColumn",&_argo0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxListCtrl_GetColumn",_kwnames,&_argo0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1697,15 +1748,16 @@ static PyObject *_wrap_wxListCtrl_GetColumn(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetColumnWidth(_swigobj,_swigarg0)  (_swigobj->GetColumnWidth(_swigarg0))
-static PyObject *_wrap_wxListCtrl_GetColumnWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_GetColumnWidth",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_GetColumnWidth",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1724,14 +1776,15 @@ static PyObject *_wrap_wxListCtrl_GetColumnWidth(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_GetCountPerPage(_swigobj)  (_swigobj->GetCountPerPage())
-static PyObject *_wrap_wxListCtrl_GetCountPerPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetCountPerPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetCountPerPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetCountPerPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1750,16 +1803,17 @@ static PyObject *_wrap_wxListCtrl_GetCountPerPage(PyObject *self, PyObject *args
 }
 
 #define wxListCtrl_GetImageList(_swigobj,_swigarg0)  (_swigobj->GetImageList(_swigarg0))
-static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageList * _result;
     wxListCtrl * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","which", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_GetImageList",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_GetImageList",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1784,15 +1838,16 @@ static PyObject *_wrap_wxListCtrl_GetImageList(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetItemData(_swigobj,_swigarg0)  (_swigobj->GetItemData(_swigarg0))
-static PyObject *_wrap_wxListCtrl_GetItemData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItemData",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_GetItemData",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1816,16 +1871,17 @@ static wxListItem * wxListCtrl_GetItem(wxListCtrl *self,long  itemId) {
             self->GetItem(*info);
             return info;
         }
-static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListItem * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","itemId", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItem",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_GetItem",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1854,16 +1910,17 @@ static wxPoint * wxListCtrl_GetItemPosition(wxListCtrl *self,long  item) {
             self->GetItemPosition(item, *pos);
             return pos;
         }
-static PyObject *_wrap_wxListCtrl_GetItemPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItemPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItemPosition",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_GetItemPosition",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1892,17 +1949,18 @@ static wxRect * wxListCtrl_GetItemRect(wxListCtrl *self,long  item,int  code) {
             self->GetItemRect(item, *rect, code);
             return rect;
         }
-static PyObject *_wrap_wxListCtrl_GetItemRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItemRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     int  _arg2 = (int ) (wxLIST_RECT_BOUNDS);
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item","code", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol|i:wxListCtrl_GetItemRect",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|i:wxListCtrl_GetItemRect",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1927,16 +1985,17 @@ static PyObject *_wrap_wxListCtrl_GetItemRect(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetItemState(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetItemState(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_GetItemState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItemState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item","stateMask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxListCtrl_GetItemState",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxListCtrl_GetItemState",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1955,14 +2014,15 @@ static PyObject *_wrap_wxListCtrl_GetItemState(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetItemCount(_swigobj)  (_swigobj->GetItemCount())
-static PyObject *_wrap_wxListCtrl_GetItemCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetItemCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetItemCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1981,16 +2041,17 @@ static PyObject *_wrap_wxListCtrl_GetItemCount(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetItemSpacing(_swigobj,_swigarg0)  (_swigobj->GetItemSpacing(_swigarg0))
-static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","isSmall", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxListCtrl_GetItemSpacing",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxListCtrl_GetItemSpacing",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2010,15 +2071,16 @@ static PyObject *_wrap_wxListCtrl_GetItemSpacing(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_GetItemText(_swigobj,_swigarg0)  (_swigobj->GetItemText(_swigarg0))
-static PyObject *_wrap_wxListCtrl_GetItemText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_GetItemText",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_GetItemText",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2042,7 +2104,7 @@ static PyObject *_wrap_wxListCtrl_GetItemText(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetNextItem(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetNextItem(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxListCtrl_GetNextItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetNextItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -2050,9 +2112,10 @@ static PyObject *_wrap_wxListCtrl_GetNextItem(PyObject *self, PyObject *args) {
     int  _arg2 = (int ) (wxLIST_NEXT_ALL);
     int  _arg3 = (int ) (wxLIST_STATE_DONTCARE);
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item","geometry","state", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol|ii:wxListCtrl_GetNextItem",&_argo0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|ii:wxListCtrl_GetNextItem",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2071,14 +2134,15 @@ static PyObject *_wrap_wxListCtrl_GetNextItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_GetSelectedItemCount(_swigobj)  (_swigobj->GetSelectedItemCount())
-static PyObject *_wrap_wxListCtrl_GetSelectedItemCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetSelectedItemCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetSelectedItemCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetSelectedItemCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2097,15 +2161,16 @@ static PyObject *_wrap_wxListCtrl_GetSelectedItemCount(PyObject *self, PyObject
 }
 
 #define wxListCtrl_GetTextColour(_swigobj)  (_swigobj->GetTextColour())
-static PyObject *_wrap_wxListCtrl_GetTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetTextColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetTextColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2125,15 +2190,16 @@ static PyObject *_wrap_wxListCtrl_GetTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_SetTextColour(_swigobj,_swigarg0)  (_swigobj->SetTextColour(_swigarg0))
-static PyObject *_wrap_wxListCtrl_SetTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_SetTextColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListCtrl_SetTextColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2160,14 +2226,15 @@ static PyObject *_wrap_wxListCtrl_SetTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_GetTopItem(_swigobj)  (_swigobj->GetTopItem())
-static PyObject *_wrap_wxListCtrl_GetTopItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_GetTopItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxListCtrl_GetTopItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxListCtrl_GetTopItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2186,7 +2253,7 @@ static PyObject *_wrap_wxListCtrl_GetTopItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_HitTest(_swigobj,_swigarg0,_swigarg1)  (_swigobj->HitTest(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -2195,12 +2262,13 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args) {
     int  temp;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","point", NULL };
 
     self = self;
 {
   _arg2 = &temp;
 }
-    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_HitTest",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListCtrl_HitTest",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2231,7 +2299,7 @@ static PyObject *_wrap_wxListCtrl_HitTest(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_InsertColumnWith(_swigobj,_swigarg0,_swigarg1)  (_swigobj->InsertColumn(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -2239,9 +2307,10 @@ static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *arg
     wxListItem * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","col","info", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_InsertColumnWith",&_argo0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_InsertColumnWith",_kwnames,&_argo0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2267,7 +2336,7 @@ static PyObject *_wrap_wxListCtrl_InsertColumnWith(PyObject *self, PyObject *arg
 }
 
 #define wxListCtrl_InsertColumn(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->InsertColumn(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxListCtrl_InsertColumn(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_InsertColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -2277,9 +2346,10 @@ static PyObject *_wrap_wxListCtrl_InsertColumn(PyObject *self, PyObject *args) {
     int  _arg4 = (int ) -1;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","col","heading","format","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlO|ii:wxListCtrl_InsertColumn",&_argo0,&_arg1,&_obj2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO|ii:wxListCtrl_InsertColumn",_kwnames,&_argo0,&_arg1,&_obj2,&_arg3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2309,16 +2379,17 @@ static PyObject *_wrap_wxListCtrl_InsertColumn(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_InsertItem(_swigobj,_swigarg0)  (_swigobj->InsertItem(_swigarg0))
-static PyObject *_wrap_wxListCtrl_InsertItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_InsertItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
     wxListItem * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","info", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_InsertItem",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListCtrl_InsertItem",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2344,7 +2415,7 @@ static PyObject *_wrap_wxListCtrl_InsertItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_InsertStringItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->InsertItem(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_InsertStringItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_InsertStringItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -2352,9 +2423,10 @@ static PyObject *_wrap_wxListCtrl_InsertStringItem(PyObject *self, PyObject *arg
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","index","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_InsertStringItem",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_InsertStringItem",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2384,16 +2456,17 @@ static PyObject *_wrap_wxListCtrl_InsertStringItem(PyObject *self, PyObject *arg
 }
 
 #define wxListCtrl_InsertImageItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->InsertItem(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_InsertImageItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_InsertImageItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","index","imageIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oli:wxListCtrl_InsertImageItem",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oli:wxListCtrl_InsertImageItem",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2412,7 +2485,7 @@ static PyObject *_wrap_wxListCtrl_InsertImageItem(PyObject *self, PyObject *args
 }
 
 #define wxListCtrl_InsertImageStringItem(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->InsertItem(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxListCtrl_InsertImageStringItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_InsertImageStringItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -2421,9 +2494,10 @@ static PyObject *_wrap_wxListCtrl_InsertImageStringItem(PyObject *self, PyObject
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","index","label","imageIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlOi:wxListCtrl_InsertImageStringItem",&_argo0,&_arg1,&_obj2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlOi:wxListCtrl_InsertImageStringItem",_kwnames,&_argo0,&_arg1,&_obj2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2453,16 +2527,17 @@ static PyObject *_wrap_wxListCtrl_InsertImageStringItem(PyObject *self, PyObject
 }
 
 #define wxListCtrl_ScrollList(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ScrollList(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_ScrollList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_ScrollList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","dx","dy", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxListCtrl_ScrollList",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxListCtrl_ScrollList",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2481,15 +2556,16 @@ static PyObject *_wrap_wxListCtrl_ScrollList(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetBackgroundColour(_swigarg0))
-static PyObject *_wrap_wxListCtrl_SetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_SetBackgroundColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListCtrl_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2516,7 +2592,7 @@ static PyObject *_wrap_wxListCtrl_SetBackgroundColour(PyObject *self, PyObject *
 }
 
 #define wxListCtrl_SetColumn(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetColumn(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_SetColumn(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
@@ -2524,9 +2600,10 @@ static PyObject *_wrap_wxListCtrl_SetColumn(PyObject *self, PyObject *args) {
     wxListItem * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","col","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxListCtrl_SetColumn",&_argo0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxListCtrl_SetColumn",_kwnames,&_argo0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2552,16 +2629,17 @@ static PyObject *_wrap_wxListCtrl_SetColumn(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetColumnWidth(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetColumnWidth(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_SetColumnWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","col","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxListCtrl_SetColumnWidth",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxListCtrl_SetColumnWidth",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2580,16 +2658,17 @@ static PyObject *_wrap_wxListCtrl_SetColumnWidth(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_SetImageList(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetImageList(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_SetImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     wxImageList * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","imageList","which", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOi:wxListCtrl_SetImageList",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxListCtrl_SetImageList",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2616,16 +2695,17 @@ static PyObject *_wrap_wxListCtrl_SetImageList(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetItem(_swigobj,_swigarg0)  (_swigobj->SetItem(_swigarg0))
-static PyObject *_wrap_wxListCtrl_SetItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     wxListItem * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","info", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxListCtrl_SetItem",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxListCtrl_SetItem",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2651,7 +2731,7 @@ static PyObject *_wrap_wxListCtrl_SetItem(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetStringItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->SetItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxListCtrl_SetStringItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetStringItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxListCtrl * _arg0;
@@ -2661,9 +2741,10 @@ static PyObject *_wrap_wxListCtrl_SetStringItem(PyObject *self, PyObject *args)
     int  _arg4 = (int ) -1;
     PyObject * _argo0 = 0;
     PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","index","col","label","imageId", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OliO|i:wxListCtrl_SetStringItem",&_argo0,&_arg1,&_arg2,&_obj3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OliO|i:wxListCtrl_SetStringItem",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2693,16 +2774,17 @@ static PyObject *_wrap_wxListCtrl_SetStringItem(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_SetItemData(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemData(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_SetItemData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item","data", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxListCtrl_SetItemData",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxListCtrl_SetItemData",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2721,7 +2803,7 @@ static PyObject *_wrap_wxListCtrl_SetItemData(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetItemImage(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetItemImage(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxListCtrl_SetItemImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
@@ -2729,9 +2811,10 @@ static PyObject *_wrap_wxListCtrl_SetItemImage(PyObject *self, PyObject *args) {
     int  _arg2;
     int  _arg3;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item","image","selImage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Olii:wxListCtrl_SetItemImage",&_argo0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Olii:wxListCtrl_SetItemImage",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2750,7 +2833,7 @@ static PyObject *_wrap_wxListCtrl_SetItemImage(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetItemPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_SetItemPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetItemPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
@@ -2758,9 +2841,10 @@ static PyObject *_wrap_wxListCtrl_SetItemPosition(PyObject *self, PyObject *args
     wxPoint * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","item","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_SetItemPosition",&_argo0,&_arg1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_SetItemPosition",_kwnames,&_argo0,&_arg1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2786,7 +2870,7 @@ static PyObject *_wrap_wxListCtrl_SetItemPosition(PyObject *self, PyObject *args
 }
 
 #define wxListCtrl_SetItemState(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetItemState(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxListCtrl_SetItemState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetItemState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxListCtrl * _arg0;
@@ -2794,9 +2878,10 @@ static PyObject *_wrap_wxListCtrl_SetItemState(PyObject *self, PyObject *args) {
     long  _arg2;
     long  _arg3;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item","state","stateMask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Olll:wxListCtrl_SetItemState",&_argo0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Olll:wxListCtrl_SetItemState",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2815,16 +2900,17 @@ static PyObject *_wrap_wxListCtrl_SetItemState(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetItemText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_SetItemText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     long  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","item","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OlO:wxListCtrl_SetItemText",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OlO:wxListCtrl_SetItemText",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2855,16 +2941,17 @@ static PyObject *_wrap_wxListCtrl_SetItemText(PyObject *self, PyObject *args) {
 }
 
 #define wxListCtrl_SetSingleStyle(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSingleStyle(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxListCtrl_SetSingleStyle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetSingleStyle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     long  _arg1;
     bool  _arg2 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","style","add", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol|i:wxListCtrl_SetSingleStyle",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol|i:wxListCtrl_SetSingleStyle",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2885,14 +2972,15 @@ static PyObject *_wrap_wxListCtrl_SetSingleStyle(PyObject *self, PyObject *args)
 }
 
 #define wxListCtrl_SetWindowStyleFlag(_swigobj,_swigarg0)  (_swigobj->SetWindowStyleFlag(_swigarg0))
-static PyObject *_wrap_wxListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxListCtrl * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","style", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxListCtrl_SetWindowStyleFlag",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxListCtrl_SetWindowStyleFlag",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2912,13 +3000,14 @@ static PyObject *_wrap_wxListCtrl_SetWindowStyleFlag(PyObject *self, PyObject *a
 }
 
 #define new_wxTreeItemId() (new wxTreeItemId())
-static PyObject *_wrap_new_wxTreeItemId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTreeItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxTreeItemId")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxTreeItemId",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2936,13 +3025,14 @@ static PyObject *_wrap_new_wxTreeItemId(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxTreeItemId(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxTreeItemId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxTreeItemId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxTreeItemId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxTreeItemId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2962,14 +3052,15 @@ static PyObject *_wrap_delete_wxTreeItemId(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeItemId_IsOk(_swigobj)  (_swigobj->IsOk())
-static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTreeItemId * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeItemId_IsOk",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeItemId_IsOk",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2988,15 +3079,16 @@ static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args) {
 }
 
 #define new_wxTreeItemData(_swigarg0) (new wxPyTreeItemData(_swigarg0))
-static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTreeItemData * _result;
     PyObject * _arg0 = (PyObject *) NULL;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "obj", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|O:new_wxTreeItemData",&_obj0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxTreeItemData",_kwnames,&_obj0)) 
         return NULL;
     if (_obj0)
 {
@@ -3018,14 +3110,15 @@ static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeItemData_GetData(_swigobj)  (_swigobj->GetData())
-static PyObject *_wrap_wxTreeItemData_GetData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeItemData_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxPyTreeItemData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeItemData_GetData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeItemData_GetData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3046,15 +3139,16 @@ static PyObject *_wrap_wxTreeItemData_GetData(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeItemData_SetData(_swigobj,_swigarg0)  (_swigobj->SetData(_swigarg0))
-static PyObject *_wrap_wxTreeItemData_SetData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeItemData_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTreeItemData * _arg0;
     PyObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","obj", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeItemData_SetData",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeItemData_SetData",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3077,15 +3171,16 @@ static PyObject *_wrap_wxTreeItemData_SetData(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeItemData_GetId(_swigobj)  (_swigobj->GetId())
-static PyObject *_wrap_wxTreeItemData_GetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeItemData_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxPyTreeItemData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeItemData_GetId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeItemData_GetId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3111,15 +3206,16 @@ static PyObject *_wrap_wxTreeItemData_GetId(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeItemData_SetId(_swigobj,_swigarg0)  (_swigobj->SetId(_swigarg0))
-static PyObject *_wrap_wxTreeItemData_SetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeItemData_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTreeItemData * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeItemData_SetId",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeItemData_SetId",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3170,15 +3266,16 @@ static void *SwigwxTreeEventTowxEvent(void *ptr) {
 }
 
 #define wxTreeEvent_GetItem(_swigobj)  (_swigobj->GetItem())
-static PyObject *_wrap_wxTreeEvent_GetItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeEvent_GetItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeEvent_GetItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3198,15 +3295,16 @@ static PyObject *_wrap_wxTreeEvent_GetItem(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeEvent_GetOldItem(_swigobj)  (_swigobj->GetOldItem())
-static PyObject *_wrap_wxTreeEvent_GetOldItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeEvent_GetOldItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetOldItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeEvent_GetOldItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3226,15 +3324,16 @@ static PyObject *_wrap_wxTreeEvent_GetOldItem(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeEvent_GetPoint(_swigobj)  (_swigobj->GetPoint())
-static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxTreeEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetPoint",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeEvent_GetPoint",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3254,14 +3353,15 @@ static PyObject *_wrap_wxTreeEvent_GetPoint(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeEvent_GetCode(_swigobj)  (_swigobj->GetCode())
-static PyObject *_wrap_wxTreeEvent_GetCode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeEvent_GetCode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTreeEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetCode",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeEvent_GetCode",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3280,14 +3380,15 @@ static PyObject *_wrap_wxTreeEvent_GetCode(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeEvent_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTreeEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeEvent_GetLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeEvent_GetLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3333,7 +3434,7 @@ static void *SwigwxTreeCtrlTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _result;
     wxWindow * _arg0;
@@ -3347,10 +3448,11 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iOOlOs:new_wxTreeCtrl",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOlOs:new_wxTreeCtrl",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_argo5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3396,14 +3498,15 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetCount(_swigobj)  (_swigobj->GetCount())
-static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     size_t  _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3422,14 +3525,15 @@ static PyObject *_wrap_wxTreeCtrl_GetCount(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetIndent(_swigobj)  (_swigobj->GetIndent())
-static PyObject *_wrap_wxTreeCtrl_GetIndent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     unsigned int  _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetIndent",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetIndent",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3448,14 +3552,15 @@ static PyObject *_wrap_wxTreeCtrl_GetIndent(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_SetIndent(_swigobj,_swigarg0)  (_swigobj->SetIndent(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_SetIndent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetIndent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     unsigned int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","indent", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxTreeCtrl_SetIndent",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxTreeCtrl_SetIndent",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3475,15 +3580,16 @@ static PyObject *_wrap_wxTreeCtrl_SetIndent(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetImageList(_swigobj)  (_swigobj->GetImageList())
-static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageList * _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetImageList",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetImageList",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3508,15 +3614,16 @@ static PyObject *_wrap_wxTreeCtrl_GetImageList(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetStateImageList(_swigobj)  (_swigobj->GetStateImageList())
-static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageList * _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetStateImageList",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetStateImageList",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3541,15 +3648,16 @@ static PyObject *_wrap_wxTreeCtrl_GetStateImageList(PyObject *self, PyObject *ar
 }
 
 #define wxTreeCtrl_SetImageList(_swigobj,_swigarg0)  (_swigobj->SetImageList(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_SetImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxImageList * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","imageList", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_SetImageList",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_SetImageList",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3576,15 +3684,16 @@ static PyObject *_wrap_wxTreeCtrl_SetImageList(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_SetStateImageList(_swigobj,_swigarg0)  (_swigobj->SetStateImageList(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_SetStateImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetStateImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxImageList * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","imageList", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_SetStateImageList",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_SetStateImageList",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3611,16 +3720,17 @@ static PyObject *_wrap_wxTreeCtrl_SetStateImageList(PyObject *self, PyObject *ar
 }
 
 #define wxTreeCtrl_GetItemText(_swigobj,_swigarg0)  (_swigobj->GetItemText(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetItemText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemText",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetItemText",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3651,16 +3761,17 @@ static PyObject *_wrap_wxTreeCtrl_GetItemText(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetItemImage(_swigobj,_swigarg0)  (_swigobj->GetItemImage(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetItemImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemImage",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetItemImage",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3686,16 +3797,17 @@ static PyObject *_wrap_wxTreeCtrl_GetItemImage(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetItemSelectedImage(_swigobj,_swigarg0)  (_swigobj->GetItemSelectedImage(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetItemSelectedImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetItemSelectedImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemSelectedImage",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetItemSelectedImage",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3721,7 +3833,7 @@ static PyObject *_wrap_wxTreeCtrl_GetItemSelectedImage(PyObject *self, PyObject
 }
 
 #define wxTreeCtrl_SetItemText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
@@ -3729,9 +3841,10 @@ static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","item","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_SetItemText",&_argo0,&_argo1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxTreeCtrl_SetItemText",_kwnames,&_argo0,&_argo1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3769,16 +3882,17 @@ static PyObject *_wrap_wxTreeCtrl_SetItemText(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_SetItemImage(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemImage(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_SetItemImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetItemImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item","image", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOi:wxTreeCtrl_SetItemImage",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxTreeCtrl_SetItemImage",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3805,16 +3919,17 @@ static PyObject *_wrap_wxTreeCtrl_SetItemImage(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_SetItemSelectedImage(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemSelectedImage(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_SetItemSelectedImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetItemSelectedImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item","image", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOi:wxTreeCtrl_SetItemSelectedImage",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxTreeCtrl_SetItemSelectedImage",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3841,7 +3956,7 @@ static PyObject *_wrap_wxTreeCtrl_SetItemSelectedImage(PyObject *self, PyObject
 }
 
 #define wxTreeCtrl_SetItemHasChildren(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemHasChildren(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_SetItemHasChildren(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetItemHasChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
@@ -3849,9 +3964,10 @@ static PyObject *_wrap_wxTreeCtrl_SetItemHasChildren(PyObject *self, PyObject *a
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","item","hasChildren", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_SetItemHasChildren",&_argo0,&_argo1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxTreeCtrl_SetItemHasChildren",_kwnames,&_argo0,&_argo1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3886,17 +4002,18 @@ static wxPyTreeItemData * wxTreeCtrl_GetItemData(wxTreeCtrl *self,const wxTreeIt
             }
             return data;
         }
-static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTreeItemData * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetItemData",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetItemData",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3930,7 +4047,7 @@ static PyObject *_wrap_wxTreeCtrl_GetItemData(PyObject *self, PyObject *args) {
 static void  wxTreeCtrl_SetItemData(wxTreeCtrl *self,const wxTreeItemId & item,wxPyTreeItemData * data) {
 	  self->SetItemData(item, data);
 	}
-static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
@@ -3938,9 +4055,10 @@ static PyObject *_wrap_wxTreeCtrl_SetItemData(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","item","data", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_SetItemData",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxTreeCtrl_SetItemData",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3981,16 +4099,17 @@ static PyObject * wxTreeCtrl_GetPyData(wxTreeCtrl *self,const wxTreeItemId & ite
             }
             return data->GetData();
 	}
-static PyObject *_wrap_wxTreeCtrl_GetPyData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetPyData",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetPyData",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4025,7 +4144,7 @@ static void  wxTreeCtrl_SetPyData(wxTreeCtrl *self,const wxTreeItemId & item,PyO
             } else
                 data->SetData(obj);
    	}
-static PyObject *_wrap_wxTreeCtrl_SetPyData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetPyData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
@@ -4033,9 +4152,10 @@ static PyObject *_wrap_wxTreeCtrl_SetPyData(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","item","obj", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_SetPyData",&_argo0,&_argo1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxTreeCtrl_SetPyData",_kwnames,&_argo0,&_argo1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4065,16 +4185,17 @@ static PyObject *_wrap_wxTreeCtrl_SetPyData(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_IsVisible(_swigobj,_swigarg0)  (_swigobj->IsVisible(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_IsVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_IsVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsVisible",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_IsVisible",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4100,16 +4221,17 @@ static PyObject *_wrap_wxTreeCtrl_IsVisible(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_ItemHasChildren(_swigobj,_swigarg0)  (_swigobj->ItemHasChildren(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_ItemHasChildren(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_ItemHasChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_ItemHasChildren",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_ItemHasChildren",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4135,16 +4257,17 @@ static PyObject *_wrap_wxTreeCtrl_ItemHasChildren(PyObject *self, PyObject *args
 }
 
 #define wxTreeCtrl_IsExpanded(_swigobj,_swigarg0)  (_swigobj->IsExpanded(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_IsExpanded(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_IsExpanded(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsExpanded",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_IsExpanded",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4170,16 +4293,17 @@ static PyObject *_wrap_wxTreeCtrl_IsExpanded(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_IsSelected(_swigobj,_swigarg0)  (_swigobj->IsSelected(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_IsSelected(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_IsSelected(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsSelected",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_IsSelected",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4205,15 +4329,16 @@ static PyObject *_wrap_wxTreeCtrl_IsSelected(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetRootItem(_swigobj)  (_swigobj->GetRootItem())
-static PyObject *_wrap_wxTreeCtrl_GetRootItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetRootItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetRootItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetRootItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4233,15 +4358,16 @@ static PyObject *_wrap_wxTreeCtrl_GetRootItem(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxTreeCtrl_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4261,17 +4387,18 @@ static PyObject *_wrap_wxTreeCtrl_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetParent(_swigobj,_swigarg0)  (_swigobj->GetParent(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetParent",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetParent",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4298,7 +4425,7 @@ static PyObject *_wrap_wxTreeCtrl_GetParent(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetChildrenCount(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetChildrenCount(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_GetChildrenCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetChildrenCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     size_t  _result;
     wxTreeCtrl * _arg0;
@@ -4307,9 +4434,10 @@ static PyObject *_wrap_wxTreeCtrl_GetChildrenCount(PyObject *self, PyObject *arg
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","item","recursively", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_GetChildrenCount",&_argo0,&_argo1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxTreeCtrl_GetChildrenCount",_kwnames,&_argo0,&_argo1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4336,7 +4464,7 @@ static PyObject *_wrap_wxTreeCtrl_GetChildrenCount(PyObject *self, PyObject *arg
 }
 
 #define wxTreeCtrl_GetFirstChild(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetFirstChild(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_GetFirstChild(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetFirstChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
@@ -4346,10 +4474,11 @@ static PyObject *_wrap_wxTreeCtrl_GetFirstChild(PyObject *self, PyObject *args)
     PyObject * _argo1 = 0;
     long  temp;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","item","INOUT", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_GetFirstChild",&_argo0,&_argo1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxTreeCtrl_GetFirstChild",_kwnames,&_argo0,&_argo1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4385,7 +4514,7 @@ static PyObject *_wrap_wxTreeCtrl_GetFirstChild(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_GetNextChild(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetNextChild(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_GetNextChild(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetNextChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
@@ -4395,10 +4524,11 @@ static PyObject *_wrap_wxTreeCtrl_GetNextChild(PyObject *self, PyObject *args) {
     PyObject * _argo1 = 0;
     long  temp;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","item","INOUT", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxTreeCtrl_GetNextChild",&_argo0,&_argo1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxTreeCtrl_GetNextChild",_kwnames,&_argo0,&_argo1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4434,17 +4564,18 @@ static PyObject *_wrap_wxTreeCtrl_GetNextChild(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetNextSibling(_swigobj,_swigarg0)  (_swigobj->GetNextSibling(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetNextSibling(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetNextSibling(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetNextSibling",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetNextSibling",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4471,17 +4602,18 @@ static PyObject *_wrap_wxTreeCtrl_GetNextSibling(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_GetPrevSibling(_swigobj,_swigarg0)  (_swigobj->GetPrevSibling(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetPrevSibling(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetPrevSibling(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetPrevSibling",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetPrevSibling",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4508,15 +4640,16 @@ static PyObject *_wrap_wxTreeCtrl_GetPrevSibling(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_GetFirstVisibleItem(_swigobj)  (_swigobj->GetFirstVisibleItem())
-static PyObject *_wrap_wxTreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetFirstVisibleItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetFirstVisibleItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4536,17 +4669,18 @@ static PyObject *_wrap_wxTreeCtrl_GetFirstVisibleItem(PyObject *self, PyObject *
 }
 
 #define wxTreeCtrl_GetNextVisible(_swigobj,_swigarg0)  (_swigobj->GetNextVisible(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetNextVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetNextVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetNextVisible",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetNextVisible",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4573,17 +4707,18 @@ static PyObject *_wrap_wxTreeCtrl_GetNextVisible(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_GetPrevVisible(_swigobj,_swigarg0)  (_swigobj->GetPrevVisible(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_GetPrevVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetPrevVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_GetPrevVisible",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_GetPrevVisible",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4610,7 +4745,7 @@ static PyObject *_wrap_wxTreeCtrl_GetPrevVisible(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_AddRoot(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->AddRoot(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxTreeCtrl_AddRoot(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_AddRoot(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
@@ -4621,10 +4756,11 @@ static PyObject *_wrap_wxTreeCtrl_AddRoot(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "self","text","image","selectedImage","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|iiO:wxTreeCtrl_AddRoot",&_argo0,&_obj1,&_arg2,&_arg3,&_argo4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|iiO:wxTreeCtrl_AddRoot",_kwnames,&_argo0,&_obj1,&_arg2,&_arg3,&_argo4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4662,7 +4798,7 @@ static PyObject *_wrap_wxTreeCtrl_AddRoot(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_PrependItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->PrependItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxTreeCtrl_PrependItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_PrependItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
@@ -4675,10 +4811,11 @@ static PyObject *_wrap_wxTreeCtrl_PrependItem(PyObject *self, PyObject *args) {
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "self","parent","text","image","selectedImage","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|iiO:wxTreeCtrl_PrependItem",&_argo0,&_argo1,&_obj2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|iiO:wxTreeCtrl_PrependItem",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3,&_arg4,&_argo5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4723,7 +4860,7 @@ static PyObject *_wrap_wxTreeCtrl_PrependItem(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_InsertItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->InsertItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
@@ -4738,10 +4875,11 @@ static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _obj3 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "self","parent","idPrevious","text","image","selectedImage","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOOO|iiO:wxTreeCtrl_InsertItem",&_argo0,&_argo1,&_argo2,&_obj3,&_arg4,&_arg5,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOO|iiO:wxTreeCtrl_InsertItem",_kwnames,&_argo0,&_argo1,&_argo2,&_obj3,&_arg4,&_arg5,&_argo6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4793,7 +4931,7 @@ static PyObject *_wrap_wxTreeCtrl_InsertItem(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_AppendItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->AppendItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxTreeCtrl_AppendItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_AppendItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
@@ -4806,10 +4944,11 @@ static PyObject *_wrap_wxTreeCtrl_AppendItem(PyObject *self, PyObject *args) {
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "self","parent","text","image","selectedImage","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|iiO:wxTreeCtrl_AppendItem",&_argo0,&_argo1,&_obj2,&_arg3,&_arg4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|iiO:wxTreeCtrl_AppendItem",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3,&_arg4,&_argo5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4854,15 +4993,16 @@ static PyObject *_wrap_wxTreeCtrl_AppendItem(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_Delete(_swigobj,_swigarg0)  (_swigobj->Delete(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_Delete(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_Delete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Delete",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_Delete",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4889,15 +5029,16 @@ static PyObject *_wrap_wxTreeCtrl_Delete(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_DeleteChildren(_swigobj,_swigarg0)  (_swigobj->DeleteChildren(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_DeleteChildren(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_DeleteChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_DeleteChildren",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_DeleteChildren",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4924,13 +5065,14 @@ static PyObject *_wrap_wxTreeCtrl_DeleteChildren(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_DeleteAllItems(_swigobj)  (_swigobj->DeleteAllItems())
-static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_DeleteAllItems",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_DeleteAllItems",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4950,15 +5092,16 @@ static PyObject *_wrap_wxTreeCtrl_DeleteAllItems(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_Expand(_swigobj,_swigarg0)  (_swigobj->Expand(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_Expand(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_Expand(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Expand",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_Expand",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4985,15 +5128,16 @@ static PyObject *_wrap_wxTreeCtrl_Expand(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_Collapse(_swigobj,_swigarg0)  (_swigobj->Collapse(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_Collapse(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_Collapse(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Collapse",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_Collapse",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5020,15 +5164,16 @@ static PyObject *_wrap_wxTreeCtrl_Collapse(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_CollapseAndReset(_swigobj,_swigarg0)  (_swigobj->CollapseAndReset(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_CollapseAndReset(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_CollapseAndReset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_CollapseAndReset",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_CollapseAndReset",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5055,15 +5200,16 @@ static PyObject *_wrap_wxTreeCtrl_CollapseAndReset(PyObject *self, PyObject *arg
 }
 
 #define wxTreeCtrl_Toggle(_swigobj,_swigarg0)  (_swigobj->Toggle(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_Toggle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_Toggle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_Toggle",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_Toggle",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5090,13 +5236,14 @@ static PyObject *_wrap_wxTreeCtrl_Toggle(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_Unselect(_swigobj)  (_swigobj->Unselect())
-static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_Unselect",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_Unselect",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5116,13 +5263,14 @@ static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_UnselectAll(_swigobj)  (_swigobj->UnselectAll())
-static PyObject *_wrap_wxTreeCtrl_UnselectAll(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_UnselectAll(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_UnselectAll",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_UnselectAll",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5142,15 +5290,16 @@ static PyObject *_wrap_wxTreeCtrl_UnselectAll(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_SelectItem(_swigobj,_swigarg0)  (_swigobj->SelectItem(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_SelectItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SelectItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_SelectItem",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_SelectItem",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5177,15 +5326,16 @@ static PyObject *_wrap_wxTreeCtrl_SelectItem(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_EnsureVisible(_swigobj,_swigarg0)  (_swigobj->EnsureVisible(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_EnsureVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_EnsureVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_EnsureVisible",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_EnsureVisible",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5212,15 +5362,16 @@ static PyObject *_wrap_wxTreeCtrl_EnsureVisible(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_ScrollTo(_swigobj,_swigarg0)  (_swigobj->ScrollTo(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_ScrollTo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_ScrollTo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_ScrollTo",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_ScrollTo",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5247,17 +5398,18 @@ static PyObject *_wrap_wxTreeCtrl_ScrollTo(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_EditLabel(_swigobj,_swigarg0)  (_swigobj->EditLabel(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_EditLabel",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_EditLabel",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5289,15 +5441,16 @@ static PyObject *_wrap_wxTreeCtrl_EditLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_GetEditControl(_swigobj)  (_swigobj->GetEditControl())
-static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxTreeCtrl * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTreeCtrl_GetEditControl",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTreeCtrl_GetEditControl",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5322,7 +5475,7 @@ static PyObject *_wrap_wxTreeCtrl_GetEditControl(PyObject *self, PyObject *args)
 }
 
 #define wxTreeCtrl_EndEditLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EndEditLabel(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
@@ -5330,9 +5483,10 @@ static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     int tempbool2 = (int) FALSE;
+    char *_kwnames[] = { "self","item","discardChanges", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_EndEditLabel",&_argo0,&_argo1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxTreeCtrl_EndEditLabel",_kwnames,&_argo0,&_argo1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5360,7 +5514,7 @@ static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_SetItemBold(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetItemBold(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTreeCtrl_SetItemBold(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_SetItemBold(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
@@ -5368,9 +5522,10 @@ static PyObject *_wrap_wxTreeCtrl_SetItemBold(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","item","bold", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxTreeCtrl_SetItemBold",&_argo0,&_argo1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxTreeCtrl_SetItemBold",_kwnames,&_argo0,&_argo1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5398,16 +5553,17 @@ static PyObject *_wrap_wxTreeCtrl_SetItemBold(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_IsBold(_swigobj,_swigarg0)  (_swigobj->IsBold(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_IsBold(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_IsBold(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTreeCtrl * _arg0;
     wxTreeItemId * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_IsBold",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_IsBold",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5433,17 +5589,18 @@ static PyObject *_wrap_wxTreeCtrl_IsBold(PyObject *self, PyObject *args) {
 }
 
 #define wxTreeCtrl_HitTest(_swigobj,_swigarg0)  (_swigobj->HitTest(_swigarg0))
-static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTreeItemId * _result;
     wxTreeCtrl * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","point", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTreeCtrl_HitTest",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTreeCtrl_HitTest",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5470,163 +5627,163 @@ static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef controls2cMethods[] = {
-	 { "wxTreeCtrl_HitTest", _wrap_wxTreeCtrl_HitTest, METH_VARARGS },
-	 { "wxTreeCtrl_IsBold", _wrap_wxTreeCtrl_IsBold, METH_VARARGS },
-	 { "wxTreeCtrl_SetItemBold", _wrap_wxTreeCtrl_SetItemBold, METH_VARARGS },
-	 { "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, METH_VARARGS },
-	 { "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, METH_VARARGS },
-	 { "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, METH_VARARGS },
-	 { "wxTreeCtrl_ScrollTo", _wrap_wxTreeCtrl_ScrollTo, METH_VARARGS },
-	 { "wxTreeCtrl_EnsureVisible", _wrap_wxTreeCtrl_EnsureVisible, METH_VARARGS },
-	 { "wxTreeCtrl_SelectItem", _wrap_wxTreeCtrl_SelectItem, METH_VARARGS },
-	 { "wxTreeCtrl_UnselectAll", _wrap_wxTreeCtrl_UnselectAll, METH_VARARGS },
-	 { "wxTreeCtrl_Unselect", _wrap_wxTreeCtrl_Unselect, METH_VARARGS },
-	 { "wxTreeCtrl_Toggle", _wrap_wxTreeCtrl_Toggle, METH_VARARGS },
-	 { "wxTreeCtrl_CollapseAndReset", _wrap_wxTreeCtrl_CollapseAndReset, METH_VARARGS },
-	 { "wxTreeCtrl_Collapse", _wrap_wxTreeCtrl_Collapse, METH_VARARGS },
-	 { "wxTreeCtrl_Expand", _wrap_wxTreeCtrl_Expand, METH_VARARGS },
-	 { "wxTreeCtrl_DeleteAllItems", _wrap_wxTreeCtrl_DeleteAllItems, METH_VARARGS },
-	 { "wxTreeCtrl_DeleteChildren", _wrap_wxTreeCtrl_DeleteChildren, METH_VARARGS },
-	 { "wxTreeCtrl_Delete", _wrap_wxTreeCtrl_Delete, METH_VARARGS },
-	 { "wxTreeCtrl_AppendItem", _wrap_wxTreeCtrl_AppendItem, METH_VARARGS },
-	 { "wxTreeCtrl_InsertItem", _wrap_wxTreeCtrl_InsertItem, METH_VARARGS },
-	 { "wxTreeCtrl_PrependItem", _wrap_wxTreeCtrl_PrependItem, METH_VARARGS },
-	 { "wxTreeCtrl_AddRoot", _wrap_wxTreeCtrl_AddRoot, METH_VARARGS },
-	 { "wxTreeCtrl_GetPrevVisible", _wrap_wxTreeCtrl_GetPrevVisible, METH_VARARGS },
-	 { "wxTreeCtrl_GetNextVisible", _wrap_wxTreeCtrl_GetNextVisible, METH_VARARGS },
-	 { "wxTreeCtrl_GetFirstVisibleItem", _wrap_wxTreeCtrl_GetFirstVisibleItem, METH_VARARGS },
-	 { "wxTreeCtrl_GetPrevSibling", _wrap_wxTreeCtrl_GetPrevSibling, METH_VARARGS },
-	 { "wxTreeCtrl_GetNextSibling", _wrap_wxTreeCtrl_GetNextSibling, METH_VARARGS },
-	 { "wxTreeCtrl_GetNextChild", _wrap_wxTreeCtrl_GetNextChild, METH_VARARGS },
-	 { "wxTreeCtrl_GetFirstChild", _wrap_wxTreeCtrl_GetFirstChild, METH_VARARGS },
-	 { "wxTreeCtrl_GetChildrenCount", _wrap_wxTreeCtrl_GetChildrenCount, METH_VARARGS },
-	 { "wxTreeCtrl_GetParent", _wrap_wxTreeCtrl_GetParent, METH_VARARGS },
-	 { "wxTreeCtrl_GetSelection", _wrap_wxTreeCtrl_GetSelection, METH_VARARGS },
-	 { "wxTreeCtrl_GetRootItem", _wrap_wxTreeCtrl_GetRootItem, METH_VARARGS },
-	 { "wxTreeCtrl_IsSelected", _wrap_wxTreeCtrl_IsSelected, METH_VARARGS },
-	 { "wxTreeCtrl_IsExpanded", _wrap_wxTreeCtrl_IsExpanded, METH_VARARGS },
-	 { "wxTreeCtrl_ItemHasChildren", _wrap_wxTreeCtrl_ItemHasChildren, METH_VARARGS },
-	 { "wxTreeCtrl_IsVisible", _wrap_wxTreeCtrl_IsVisible, METH_VARARGS },
-	 { "wxTreeCtrl_SetPyData", _wrap_wxTreeCtrl_SetPyData, METH_VARARGS },
-	 { "wxTreeCtrl_GetPyData", _wrap_wxTreeCtrl_GetPyData, METH_VARARGS },
-	 { "wxTreeCtrl_SetItemData", _wrap_wxTreeCtrl_SetItemData, METH_VARARGS },
-	 { "wxTreeCtrl_GetItemData", _wrap_wxTreeCtrl_GetItemData, METH_VARARGS },
-	 { "wxTreeCtrl_SetItemHasChildren", _wrap_wxTreeCtrl_SetItemHasChildren, METH_VARARGS },
-	 { "wxTreeCtrl_SetItemSelectedImage", _wrap_wxTreeCtrl_SetItemSelectedImage, METH_VARARGS },
-	 { "wxTreeCtrl_SetItemImage", _wrap_wxTreeCtrl_SetItemImage, METH_VARARGS },
-	 { "wxTreeCtrl_SetItemText", _wrap_wxTreeCtrl_SetItemText, METH_VARARGS },
-	 { "wxTreeCtrl_GetItemSelectedImage", _wrap_wxTreeCtrl_GetItemSelectedImage, METH_VARARGS },
-	 { "wxTreeCtrl_GetItemImage", _wrap_wxTreeCtrl_GetItemImage, METH_VARARGS },
-	 { "wxTreeCtrl_GetItemText", _wrap_wxTreeCtrl_GetItemText, METH_VARARGS },
-	 { "wxTreeCtrl_SetStateImageList", _wrap_wxTreeCtrl_SetStateImageList, METH_VARARGS },
-	 { "wxTreeCtrl_SetImageList", _wrap_wxTreeCtrl_SetImageList, METH_VARARGS },
-	 { "wxTreeCtrl_GetStateImageList", _wrap_wxTreeCtrl_GetStateImageList, METH_VARARGS },
-	 { "wxTreeCtrl_GetImageList", _wrap_wxTreeCtrl_GetImageList, METH_VARARGS },
-	 { "wxTreeCtrl_SetIndent", _wrap_wxTreeCtrl_SetIndent, METH_VARARGS },
-	 { "wxTreeCtrl_GetIndent", _wrap_wxTreeCtrl_GetIndent, METH_VARARGS },
-	 { "wxTreeCtrl_GetCount", _wrap_wxTreeCtrl_GetCount, METH_VARARGS },
-	 { "new_wxTreeCtrl", _wrap_new_wxTreeCtrl, METH_VARARGS },
-	 { "wxTreeEvent_GetLabel", _wrap_wxTreeEvent_GetLabel, METH_VARARGS },
-	 { "wxTreeEvent_GetCode", _wrap_wxTreeEvent_GetCode, METH_VARARGS },
-	 { "wxTreeEvent_GetPoint", _wrap_wxTreeEvent_GetPoint, METH_VARARGS },
-	 { "wxTreeEvent_GetOldItem", _wrap_wxTreeEvent_GetOldItem, METH_VARARGS },
-	 { "wxTreeEvent_GetItem", _wrap_wxTreeEvent_GetItem, METH_VARARGS },
-	 { "wxTreeItemData_SetId", _wrap_wxTreeItemData_SetId, METH_VARARGS },
-	 { "wxTreeItemData_GetId", _wrap_wxTreeItemData_GetId, METH_VARARGS },
-	 { "wxTreeItemData_SetData", _wrap_wxTreeItemData_SetData, METH_VARARGS },
-	 { "wxTreeItemData_GetData", _wrap_wxTreeItemData_GetData, METH_VARARGS },
-	 { "new_wxTreeItemData", _wrap_new_wxTreeItemData, METH_VARARGS },
-	 { "wxTreeItemId_IsOk", _wrap_wxTreeItemId_IsOk, METH_VARARGS },
-	 { "delete_wxTreeItemId", _wrap_delete_wxTreeItemId, METH_VARARGS },
-	 { "new_wxTreeItemId", _wrap_new_wxTreeItemId, METH_VARARGS },
-	 { "wxListCtrl_SetWindowStyleFlag", _wrap_wxListCtrl_SetWindowStyleFlag, METH_VARARGS },
-	 { "wxListCtrl_SetSingleStyle", _wrap_wxListCtrl_SetSingleStyle, METH_VARARGS },
-	 { "wxListCtrl_SetItemText", _wrap_wxListCtrl_SetItemText, METH_VARARGS },
-	 { "wxListCtrl_SetItemState", _wrap_wxListCtrl_SetItemState, METH_VARARGS },
-	 { "wxListCtrl_SetItemPosition", _wrap_wxListCtrl_SetItemPosition, METH_VARARGS },
-	 { "wxListCtrl_SetItemImage", _wrap_wxListCtrl_SetItemImage, METH_VARARGS },
-	 { "wxListCtrl_SetItemData", _wrap_wxListCtrl_SetItemData, METH_VARARGS },
-	 { "wxListCtrl_SetStringItem", _wrap_wxListCtrl_SetStringItem, METH_VARARGS },
-	 { "wxListCtrl_SetItem", _wrap_wxListCtrl_SetItem, METH_VARARGS },
-	 { "wxListCtrl_SetImageList", _wrap_wxListCtrl_SetImageList, METH_VARARGS },
-	 { "wxListCtrl_SetColumnWidth", _wrap_wxListCtrl_SetColumnWidth, METH_VARARGS },
-	 { "wxListCtrl_SetColumn", _wrap_wxListCtrl_SetColumn, METH_VARARGS },
-	 { "wxListCtrl_SetBackgroundColour", _wrap_wxListCtrl_SetBackgroundColour, METH_VARARGS },
-	 { "wxListCtrl_ScrollList", _wrap_wxListCtrl_ScrollList, METH_VARARGS },
-	 { "wxListCtrl_InsertImageStringItem", _wrap_wxListCtrl_InsertImageStringItem, METH_VARARGS },
-	 { "wxListCtrl_InsertImageItem", _wrap_wxListCtrl_InsertImageItem, METH_VARARGS },
-	 { "wxListCtrl_InsertStringItem", _wrap_wxListCtrl_InsertStringItem, METH_VARARGS },
-	 { "wxListCtrl_InsertItem", _wrap_wxListCtrl_InsertItem, METH_VARARGS },
-	 { "wxListCtrl_InsertColumn", _wrap_wxListCtrl_InsertColumn, METH_VARARGS },
-	 { "wxListCtrl_InsertColumnWith", _wrap_wxListCtrl_InsertColumnWith, METH_VARARGS },
-	 { "wxListCtrl_HitTest", _wrap_wxListCtrl_HitTest, METH_VARARGS },
-	 { "wxListCtrl_GetTopItem", _wrap_wxListCtrl_GetTopItem, METH_VARARGS },
-	 { "wxListCtrl_SetTextColour", _wrap_wxListCtrl_SetTextColour, METH_VARARGS },
-	 { "wxListCtrl_GetTextColour", _wrap_wxListCtrl_GetTextColour, METH_VARARGS },
-	 { "wxListCtrl_GetSelectedItemCount", _wrap_wxListCtrl_GetSelectedItemCount, METH_VARARGS },
-	 { "wxListCtrl_GetNextItem", _wrap_wxListCtrl_GetNextItem, METH_VARARGS },
-	 { "wxListCtrl_GetItemText", _wrap_wxListCtrl_GetItemText, METH_VARARGS },
-	 { "wxListCtrl_GetItemSpacing", _wrap_wxListCtrl_GetItemSpacing, METH_VARARGS },
-	 { "wxListCtrl_GetItemCount", _wrap_wxListCtrl_GetItemCount, METH_VARARGS },
-	 { "wxListCtrl_GetItemState", _wrap_wxListCtrl_GetItemState, METH_VARARGS },
-	 { "wxListCtrl_GetItemRect", _wrap_wxListCtrl_GetItemRect, METH_VARARGS },
-	 { "wxListCtrl_GetItemPosition", _wrap_wxListCtrl_GetItemPosition, METH_VARARGS },
-	 { "wxListCtrl_GetItem", _wrap_wxListCtrl_GetItem, METH_VARARGS },
-	 { "wxListCtrl_GetItemData", _wrap_wxListCtrl_GetItemData, METH_VARARGS },
-	 { "wxListCtrl_GetImageList", _wrap_wxListCtrl_GetImageList, METH_VARARGS },
-	 { "wxListCtrl_GetCountPerPage", _wrap_wxListCtrl_GetCountPerPage, METH_VARARGS },
-	 { "wxListCtrl_GetColumnWidth", _wrap_wxListCtrl_GetColumnWidth, METH_VARARGS },
-	 { "wxListCtrl_GetColumn", _wrap_wxListCtrl_GetColumn, METH_VARARGS },
-	 { "wxListCtrl_FindItemAtPos", _wrap_wxListCtrl_FindItemAtPos, METH_VARARGS },
-	 { "wxListCtrl_FindItemData", _wrap_wxListCtrl_FindItemData, METH_VARARGS },
-	 { "wxListCtrl_FindItem", _wrap_wxListCtrl_FindItem, METH_VARARGS },
-	 { "wxListCtrl_EnsureVisible", _wrap_wxListCtrl_EnsureVisible, METH_VARARGS },
-	 { "wxListCtrl_GetEditControl", _wrap_wxListCtrl_GetEditControl, METH_VARARGS },
-	 { "wxListCtrl_EndEditLabel", _wrap_wxListCtrl_EndEditLabel, METH_VARARGS },
-	 { "wxListCtrl_EditLabel", _wrap_wxListCtrl_EditLabel, METH_VARARGS },
-	 { "wxListCtrl_ClearAll", _wrap_wxListCtrl_ClearAll, METH_VARARGS },
-	 { "wxListCtrl_DeleteAllColumns", _wrap_wxListCtrl_DeleteAllColumns, METH_VARARGS },
-	 { "wxListCtrl_DeleteColumn", _wrap_wxListCtrl_DeleteColumn, METH_VARARGS },
-	 { "wxListCtrl_DeleteAllItems", _wrap_wxListCtrl_DeleteAllItems, METH_VARARGS },
-	 { "wxListCtrl_DeleteItem", _wrap_wxListCtrl_DeleteItem, METH_VARARGS },
-	 { "wxListCtrl_Arrange", _wrap_wxListCtrl_Arrange, METH_VARARGS },
-	 { "new_wxListCtrl", _wrap_new_wxListCtrl, METH_VARARGS },
-	 { "wxListEvent_m_item_get", _wrap_wxListEvent_m_item_get, METH_VARARGS },
-	 { "wxListEvent_m_item_set", _wrap_wxListEvent_m_item_set, METH_VARARGS },
-	 { "wxListEvent_m_pointDrag_get", _wrap_wxListEvent_m_pointDrag_get, METH_VARARGS },
-	 { "wxListEvent_m_pointDrag_set", _wrap_wxListEvent_m_pointDrag_set, METH_VARARGS },
-	 { "wxListEvent_m_cancelled_get", _wrap_wxListEvent_m_cancelled_get, METH_VARARGS },
-	 { "wxListEvent_m_cancelled_set", _wrap_wxListEvent_m_cancelled_set, METH_VARARGS },
-	 { "wxListEvent_m_col_get", _wrap_wxListEvent_m_col_get, METH_VARARGS },
-	 { "wxListEvent_m_col_set", _wrap_wxListEvent_m_col_set, METH_VARARGS },
-	 { "wxListEvent_m_oldItemIndex_get", _wrap_wxListEvent_m_oldItemIndex_get, METH_VARARGS },
-	 { "wxListEvent_m_oldItemIndex_set", _wrap_wxListEvent_m_oldItemIndex_set, METH_VARARGS },
-	 { "wxListEvent_m_itemIndex_get", _wrap_wxListEvent_m_itemIndex_get, METH_VARARGS },
-	 { "wxListEvent_m_itemIndex_set", _wrap_wxListEvent_m_itemIndex_set, METH_VARARGS },
-	 { "wxListEvent_m_code_get", _wrap_wxListEvent_m_code_get, METH_VARARGS },
-	 { "wxListEvent_m_code_set", _wrap_wxListEvent_m_code_set, METH_VARARGS },
-	 { "delete_wxListItem", _wrap_delete_wxListItem, METH_VARARGS },
-	 { "new_wxListItem", _wrap_new_wxListItem, METH_VARARGS },
-	 { "wxListItem_m_width_get", _wrap_wxListItem_m_width_get, METH_VARARGS },
-	 { "wxListItem_m_width_set", _wrap_wxListItem_m_width_set, METH_VARARGS },
-	 { "wxListItem_m_format_get", _wrap_wxListItem_m_format_get, METH_VARARGS },
-	 { "wxListItem_m_format_set", _wrap_wxListItem_m_format_set, METH_VARARGS },
-	 { "wxListItem_m_data_get", _wrap_wxListItem_m_data_get, METH_VARARGS },
-	 { "wxListItem_m_data_set", _wrap_wxListItem_m_data_set, METH_VARARGS },
-	 { "wxListItem_m_image_get", _wrap_wxListItem_m_image_get, METH_VARARGS },
-	 { "wxListItem_m_image_set", _wrap_wxListItem_m_image_set, METH_VARARGS },
-	 { "wxListItem_m_text_get", _wrap_wxListItem_m_text_get, METH_VARARGS },
-	 { "wxListItem_m_text_set", _wrap_wxListItem_m_text_set, METH_VARARGS },
-	 { "wxListItem_m_stateMask_get", _wrap_wxListItem_m_stateMask_get, METH_VARARGS },
-	 { "wxListItem_m_stateMask_set", _wrap_wxListItem_m_stateMask_set, METH_VARARGS },
-	 { "wxListItem_m_state_get", _wrap_wxListItem_m_state_get, METH_VARARGS },
-	 { "wxListItem_m_state_set", _wrap_wxListItem_m_state_set, METH_VARARGS },
-	 { "wxListItem_m_col_get", _wrap_wxListItem_m_col_get, METH_VARARGS },
-	 { "wxListItem_m_col_set", _wrap_wxListItem_m_col_set, METH_VARARGS },
-	 { "wxListItem_m_itemId_get", _wrap_wxListItem_m_itemId_get, METH_VARARGS },
-	 { "wxListItem_m_itemId_set", _wrap_wxListItem_m_itemId_set, METH_VARARGS },
-	 { "wxListItem_m_mask_get", _wrap_wxListItem_m_mask_get, METH_VARARGS },
-	 { "wxListItem_m_mask_set", _wrap_wxListItem_m_mask_set, METH_VARARGS },
+	 { "wxTreeCtrl_HitTest", (PyCFunction) _wrap_wxTreeCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_IsBold", (PyCFunction) _wrap_wxTreeCtrl_IsBold, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetItemBold", (PyCFunction) _wrap_wxTreeCtrl_SetItemBold, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_EndEditLabel", (PyCFunction) _wrap_wxTreeCtrl_EndEditLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetEditControl", (PyCFunction) _wrap_wxTreeCtrl_GetEditControl, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_EditLabel", (PyCFunction) _wrap_wxTreeCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_ScrollTo", (PyCFunction) _wrap_wxTreeCtrl_ScrollTo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_EnsureVisible", (PyCFunction) _wrap_wxTreeCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SelectItem", (PyCFunction) _wrap_wxTreeCtrl_SelectItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_UnselectAll", (PyCFunction) _wrap_wxTreeCtrl_UnselectAll, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_Unselect", (PyCFunction) _wrap_wxTreeCtrl_Unselect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_Toggle", (PyCFunction) _wrap_wxTreeCtrl_Toggle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_CollapseAndReset", (PyCFunction) _wrap_wxTreeCtrl_CollapseAndReset, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_Collapse", (PyCFunction) _wrap_wxTreeCtrl_Collapse, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_Expand", (PyCFunction) _wrap_wxTreeCtrl_Expand, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_DeleteAllItems", (PyCFunction) _wrap_wxTreeCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_DeleteChildren", (PyCFunction) _wrap_wxTreeCtrl_DeleteChildren, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_Delete", (PyCFunction) _wrap_wxTreeCtrl_Delete, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_AppendItem", (PyCFunction) _wrap_wxTreeCtrl_AppendItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_InsertItem", (PyCFunction) _wrap_wxTreeCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_PrependItem", (PyCFunction) _wrap_wxTreeCtrl_PrependItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_AddRoot", (PyCFunction) _wrap_wxTreeCtrl_AddRoot, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetPrevVisible", (PyCFunction) _wrap_wxTreeCtrl_GetPrevVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetNextVisible", (PyCFunction) _wrap_wxTreeCtrl_GetNextVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetFirstVisibleItem", (PyCFunction) _wrap_wxTreeCtrl_GetFirstVisibleItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetPrevSibling", (PyCFunction) _wrap_wxTreeCtrl_GetPrevSibling, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetNextSibling", (PyCFunction) _wrap_wxTreeCtrl_GetNextSibling, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetNextChild", (PyCFunction) _wrap_wxTreeCtrl_GetNextChild, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetFirstChild", (PyCFunction) _wrap_wxTreeCtrl_GetFirstChild, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetChildrenCount", (PyCFunction) _wrap_wxTreeCtrl_GetChildrenCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetParent", (PyCFunction) _wrap_wxTreeCtrl_GetParent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetSelection", (PyCFunction) _wrap_wxTreeCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetRootItem", (PyCFunction) _wrap_wxTreeCtrl_GetRootItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_IsSelected", (PyCFunction) _wrap_wxTreeCtrl_IsSelected, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_IsExpanded", (PyCFunction) _wrap_wxTreeCtrl_IsExpanded, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_ItemHasChildren", (PyCFunction) _wrap_wxTreeCtrl_ItemHasChildren, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_IsVisible", (PyCFunction) _wrap_wxTreeCtrl_IsVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetPyData", (PyCFunction) _wrap_wxTreeCtrl_SetPyData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetPyData", (PyCFunction) _wrap_wxTreeCtrl_GetPyData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetItemData", (PyCFunction) _wrap_wxTreeCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetItemData", (PyCFunction) _wrap_wxTreeCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetItemHasChildren", (PyCFunction) _wrap_wxTreeCtrl_SetItemHasChildren, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetItemSelectedImage", (PyCFunction) _wrap_wxTreeCtrl_SetItemSelectedImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetItemImage", (PyCFunction) _wrap_wxTreeCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetItemText", (PyCFunction) _wrap_wxTreeCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetItemSelectedImage", (PyCFunction) _wrap_wxTreeCtrl_GetItemSelectedImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetItemImage", (PyCFunction) _wrap_wxTreeCtrl_GetItemImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetItemText", (PyCFunction) _wrap_wxTreeCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetStateImageList", (PyCFunction) _wrap_wxTreeCtrl_SetStateImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetImageList", (PyCFunction) _wrap_wxTreeCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetStateImageList", (PyCFunction) _wrap_wxTreeCtrl_GetStateImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetImageList", (PyCFunction) _wrap_wxTreeCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_SetIndent", (PyCFunction) _wrap_wxTreeCtrl_SetIndent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetIndent", (PyCFunction) _wrap_wxTreeCtrl_GetIndent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeCtrl_GetCount", (PyCFunction) _wrap_wxTreeCtrl_GetCount, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxTreeCtrl", (PyCFunction) _wrap_new_wxTreeCtrl, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeEvent_GetLabel", (PyCFunction) _wrap_wxTreeEvent_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeEvent_GetCode", (PyCFunction) _wrap_wxTreeEvent_GetCode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeEvent_GetPoint", (PyCFunction) _wrap_wxTreeEvent_GetPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeEvent_GetOldItem", (PyCFunction) _wrap_wxTreeEvent_GetOldItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeEvent_GetItem", (PyCFunction) _wrap_wxTreeEvent_GetItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeItemData_SetId", (PyCFunction) _wrap_wxTreeItemData_SetId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeItemData_GetId", (PyCFunction) _wrap_wxTreeItemData_GetId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeItemData_SetData", (PyCFunction) _wrap_wxTreeItemData_SetData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeItemData_GetData", (PyCFunction) _wrap_wxTreeItemData_GetData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxTreeItemData", (PyCFunction) _wrap_new_wxTreeItemData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTreeItemId_IsOk", (PyCFunction) _wrap_wxTreeItemId_IsOk, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxTreeItemId", (PyCFunction) _wrap_delete_wxTreeItemId, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxTreeItemId", (PyCFunction) _wrap_new_wxTreeItemId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetWindowStyleFlag", (PyCFunction) _wrap_wxListCtrl_SetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetSingleStyle", (PyCFunction) _wrap_wxListCtrl_SetSingleStyle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetItemText", (PyCFunction) _wrap_wxListCtrl_SetItemText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetItemState", (PyCFunction) _wrap_wxListCtrl_SetItemState, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetItemPosition", (PyCFunction) _wrap_wxListCtrl_SetItemPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetItemImage", (PyCFunction) _wrap_wxListCtrl_SetItemImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetItemData", (PyCFunction) _wrap_wxListCtrl_SetItemData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetStringItem", (PyCFunction) _wrap_wxListCtrl_SetStringItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetItem", (PyCFunction) _wrap_wxListCtrl_SetItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetImageList", (PyCFunction) _wrap_wxListCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetColumnWidth", (PyCFunction) _wrap_wxListCtrl_SetColumnWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetColumn", (PyCFunction) _wrap_wxListCtrl_SetColumn, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetBackgroundColour", (PyCFunction) _wrap_wxListCtrl_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_ScrollList", (PyCFunction) _wrap_wxListCtrl_ScrollList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_InsertImageStringItem", (PyCFunction) _wrap_wxListCtrl_InsertImageStringItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_InsertImageItem", (PyCFunction) _wrap_wxListCtrl_InsertImageItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_InsertStringItem", (PyCFunction) _wrap_wxListCtrl_InsertStringItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_InsertItem", (PyCFunction) _wrap_wxListCtrl_InsertItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_InsertColumn", (PyCFunction) _wrap_wxListCtrl_InsertColumn, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_InsertColumnWith", (PyCFunction) _wrap_wxListCtrl_InsertColumnWith, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_HitTest", (PyCFunction) _wrap_wxListCtrl_HitTest, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetTopItem", (PyCFunction) _wrap_wxListCtrl_GetTopItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_SetTextColour", (PyCFunction) _wrap_wxListCtrl_SetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetTextColour", (PyCFunction) _wrap_wxListCtrl_GetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetSelectedItemCount", (PyCFunction) _wrap_wxListCtrl_GetSelectedItemCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetNextItem", (PyCFunction) _wrap_wxListCtrl_GetNextItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItemText", (PyCFunction) _wrap_wxListCtrl_GetItemText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItemSpacing", (PyCFunction) _wrap_wxListCtrl_GetItemSpacing, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItemCount", (PyCFunction) _wrap_wxListCtrl_GetItemCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItemState", (PyCFunction) _wrap_wxListCtrl_GetItemState, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItemRect", (PyCFunction) _wrap_wxListCtrl_GetItemRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItemPosition", (PyCFunction) _wrap_wxListCtrl_GetItemPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItem", (PyCFunction) _wrap_wxListCtrl_GetItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetItemData", (PyCFunction) _wrap_wxListCtrl_GetItemData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetImageList", (PyCFunction) _wrap_wxListCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetCountPerPage", (PyCFunction) _wrap_wxListCtrl_GetCountPerPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetColumnWidth", (PyCFunction) _wrap_wxListCtrl_GetColumnWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetColumn", (PyCFunction) _wrap_wxListCtrl_GetColumn, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_FindItemAtPos", (PyCFunction) _wrap_wxListCtrl_FindItemAtPos, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_FindItemData", (PyCFunction) _wrap_wxListCtrl_FindItemData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_FindItem", (PyCFunction) _wrap_wxListCtrl_FindItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_EnsureVisible", (PyCFunction) _wrap_wxListCtrl_EnsureVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_GetEditControl", (PyCFunction) _wrap_wxListCtrl_GetEditControl, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_EndEditLabel", (PyCFunction) _wrap_wxListCtrl_EndEditLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_EditLabel", (PyCFunction) _wrap_wxListCtrl_EditLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_ClearAll", (PyCFunction) _wrap_wxListCtrl_ClearAll, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_DeleteAllColumns", (PyCFunction) _wrap_wxListCtrl_DeleteAllColumns, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_DeleteColumn", (PyCFunction) _wrap_wxListCtrl_DeleteColumn, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_DeleteAllItems", (PyCFunction) _wrap_wxListCtrl_DeleteAllItems, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_DeleteItem", (PyCFunction) _wrap_wxListCtrl_DeleteItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListCtrl_Arrange", (PyCFunction) _wrap_wxListCtrl_Arrange, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxListCtrl", (PyCFunction) _wrap_new_wxListCtrl, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_item_get", (PyCFunction) _wrap_wxListEvent_m_item_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_item_set", (PyCFunction) _wrap_wxListEvent_m_item_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_pointDrag_get", (PyCFunction) _wrap_wxListEvent_m_pointDrag_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_pointDrag_set", (PyCFunction) _wrap_wxListEvent_m_pointDrag_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_cancelled_get", (PyCFunction) _wrap_wxListEvent_m_cancelled_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_cancelled_set", (PyCFunction) _wrap_wxListEvent_m_cancelled_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_col_get", (PyCFunction) _wrap_wxListEvent_m_col_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_col_set", (PyCFunction) _wrap_wxListEvent_m_col_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_oldItemIndex_get", (PyCFunction) _wrap_wxListEvent_m_oldItemIndex_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_oldItemIndex_set", (PyCFunction) _wrap_wxListEvent_m_oldItemIndex_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_itemIndex_get", (PyCFunction) _wrap_wxListEvent_m_itemIndex_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_itemIndex_set", (PyCFunction) _wrap_wxListEvent_m_itemIndex_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_code_get", (PyCFunction) _wrap_wxListEvent_m_code_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListEvent_m_code_set", (PyCFunction) _wrap_wxListEvent_m_code_set, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxListItem", (PyCFunction) _wrap_delete_wxListItem, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxListItem", (PyCFunction) _wrap_new_wxListItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_width_get", (PyCFunction) _wrap_wxListItem_m_width_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_width_set", (PyCFunction) _wrap_wxListItem_m_width_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_format_get", (PyCFunction) _wrap_wxListItem_m_format_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_format_set", (PyCFunction) _wrap_wxListItem_m_format_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_data_get", (PyCFunction) _wrap_wxListItem_m_data_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_data_set", (PyCFunction) _wrap_wxListItem_m_data_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_image_get", (PyCFunction) _wrap_wxListItem_m_image_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_image_set", (PyCFunction) _wrap_wxListItem_m_image_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_text_get", (PyCFunction) _wrap_wxListItem_m_text_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_text_set", (PyCFunction) _wrap_wxListItem_m_text_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_stateMask_get", (PyCFunction) _wrap_wxListItem_m_stateMask_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_stateMask_set", (PyCFunction) _wrap_wxListItem_m_stateMask_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_state_get", (PyCFunction) _wrap_wxListItem_m_state_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_state_set", (PyCFunction) _wrap_wxListItem_m_state_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_col_get", (PyCFunction) _wrap_wxListItem_m_col_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_col_set", (PyCFunction) _wrap_wxListItem_m_col_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_itemId_get", (PyCFunction) _wrap_wxListItem_m_itemId_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_itemId_set", (PyCFunction) _wrap_wxListItem_m_itemId_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_mask_get", (PyCFunction) _wrap_wxListItem_m_mask_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxListItem_m_mask_set", (PyCFunction) _wrap_wxListItem_m_mask_set, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp
index cebd498728..65793a58fd 100644
--- a/utils/wxPython/src/msw/events.cpp
+++ b/utils/wxPython/src/msw/events.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -119,15 +119,16 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 extern "C" {
 #endif
 #define wxEvent_GetEventObject(_swigobj)  (_swigobj->GetEventObject())
-static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxObject * _result;
     wxEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxEvent_GetEventObject",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetEventObject",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -152,14 +153,15 @@ static PyObject *_wrap_wxEvent_GetEventObject(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_GetEventType(_swigobj)  (_swigobj->GetEventType())
-static PyObject *_wrap_wxEvent_GetEventType(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_GetEventType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxEventType  _result;
     wxEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxEvent_GetEventType",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetEventType",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -178,14 +180,15 @@ static PyObject *_wrap_wxEvent_GetEventType(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_GetId(_swigobj)  (_swigobj->GetId())
-static PyObject *_wrap_wxEvent_GetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxEvent_GetId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -204,14 +207,15 @@ static PyObject *_wrap_wxEvent_GetId(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_GetSkipped(_swigobj)  (_swigobj->GetSkipped())
-static PyObject *_wrap_wxEvent_GetSkipped(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_GetSkipped(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxEvent_GetSkipped",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetSkipped",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -230,14 +234,15 @@ static PyObject *_wrap_wxEvent_GetSkipped(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_GetTimestamp(_swigobj)  (_swigobj->GetTimestamp())
-static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxEvent_GetTimestamp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEvent_GetTimestamp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -256,15 +261,16 @@ static PyObject *_wrap_wxEvent_GetTimestamp(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_SetEventObject(_swigobj,_swigarg0)  (_swigobj->SetEventObject(_swigarg0))
-static PyObject *_wrap_wxEvent_SetEventObject(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_SetEventObject(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     wxObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","object", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxEvent_SetEventObject",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxEvent_SetEventObject",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -291,14 +297,15 @@ static PyObject *_wrap_wxEvent_SetEventObject(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_SetEventType(_swigobj,_swigarg0)  (_swigobj->SetEventType(_swigarg0))
-static PyObject *_wrap_wxEvent_SetEventType(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_SetEventType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     wxEventType  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","typ", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxEvent_SetEventType",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxEvent_SetEventType",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -318,14 +325,15 @@ static PyObject *_wrap_wxEvent_SetEventType(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_SetId(_swigobj,_swigarg0)  (_swigobj->SetId(_swigarg0))
-static PyObject *_wrap_wxEvent_SetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxEvent_SetId",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxEvent_SetId",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -345,14 +353,15 @@ static PyObject *_wrap_wxEvent_SetId(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_SetTimestamp(_swigobj,_swigarg0)  (_swigobj->SetTimestamp(_swigarg0))
-static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","timeStamp", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxEvent_SetTimestamp",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxEvent_SetTimestamp",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -372,15 +381,16 @@ static PyObject *_wrap_wxEvent_SetTimestamp(PyObject *self, PyObject *args) {
 }
 
 #define wxEvent_Skip(_swigobj,_swigarg0)  (_swigobj->Skip(_swigarg0))
-static PyObject *_wrap_wxEvent_Skip(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvent_Skip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxEvent * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","skip", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxEvent_Skip",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxEvent_Skip",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -409,15 +419,16 @@ static void *SwigwxSizeEventTowxEvent(void *ptr) {
 }
 
 #define wxSizeEvent_GetSize(_swigobj)  (_swigobj->GetSize())
-static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSizeEvent_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxSizeEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSizeEvent_GetSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSizeEvent_GetSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -445,15 +456,16 @@ static void *SwigwxCloseEventTowxEvent(void *ptr) {
 }
 
 #define wxCloseEvent_SetLoggingOff(_swigobj,_swigarg0)  (_swigobj->SetLoggingOff(_swigarg0))
-static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","loggingOff", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxCloseEvent_SetLoggingOff",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCloseEvent_SetLoggingOff",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -474,14 +486,15 @@ static PyObject *_wrap_wxCloseEvent_SetLoggingOff(PyObject *self, PyObject *args
 }
 
 #define wxCloseEvent_GetLoggingOff(_swigobj)  (_swigobj->GetLoggingOff())
-static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCloseEvent_GetLoggingOff",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCloseEvent_GetLoggingOff",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -500,15 +513,16 @@ static PyObject *_wrap_wxCloseEvent_GetLoggingOff(PyObject *self, PyObject *args
 }
 
 #define wxCloseEvent_Veto(_swigobj,_swigarg0)  (_swigobj->Veto(_swigarg0))
-static PyObject *_wrap_wxCloseEvent_Veto(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCloseEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","veto", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxCloseEvent_Veto",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxCloseEvent_Veto",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -529,14 +543,15 @@ static PyObject *_wrap_wxCloseEvent_Veto(PyObject *self, PyObject *args) {
 }
 
 #define wxCloseEvent_CanVeto(_swigobj)  (_swigobj->CanVeto())
-static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCloseEvent_CanVeto",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCloseEvent_CanVeto",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -555,14 +570,15 @@ static PyObject *_wrap_wxCloseEvent_CanVeto(PyObject *self, PyObject *args) {
 }
 
 #define wxCloseEvent_GetVeto(_swigobj)  (_swigobj->GetVeto())
-static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCloseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCloseEvent_GetVeto",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCloseEvent_GetVeto",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -581,15 +597,16 @@ static PyObject *_wrap_wxCloseEvent_GetVeto(PyObject *self, PyObject *args) {
 }
 
 #define wxCloseEvent_SetCanVeto(_swigobj,_swigarg0)  (_swigobj->SetCanVeto(_swigarg0))
-static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCloseEvent_SetCanVeto(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCloseEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","canVeto", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxCloseEvent_SetCanVeto",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCloseEvent_SetCanVeto",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -618,14 +635,15 @@ static void *SwigwxCommandEventTowxEvent(void *ptr) {
 }
 
 #define wxCommandEvent_Checked(_swigobj)  (_swigobj->Checked())
-static PyObject *_wrap_wxCommandEvent_Checked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCommandEvent_Checked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCommandEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_Checked",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCommandEvent_Checked",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -644,14 +662,15 @@ static PyObject *_wrap_wxCommandEvent_Checked(PyObject *self, PyObject *args) {
 }
 
 #define wxCommandEvent_GetExtraLong(_swigobj)  (_swigobj->GetExtraLong())
-static PyObject *_wrap_wxCommandEvent_GetExtraLong(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCommandEvent_GetExtraLong(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxCommandEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetExtraLong",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCommandEvent_GetExtraLong",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -670,14 +689,15 @@ static PyObject *_wrap_wxCommandEvent_GetExtraLong(PyObject *self, PyObject *arg
 }
 
 #define wxCommandEvent_GetInt(_swigobj)  (_swigobj->GetInt())
-static PyObject *_wrap_wxCommandEvent_GetInt(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCommandEvent_GetInt(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxCommandEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetInt",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCommandEvent_GetInt",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -696,14 +716,15 @@ static PyObject *_wrap_wxCommandEvent_GetInt(PyObject *self, PyObject *args) {
 }
 
 #define wxCommandEvent_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxCommandEvent_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCommandEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxCommandEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCommandEvent_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -722,14 +743,15 @@ static PyObject *_wrap_wxCommandEvent_GetSelection(PyObject *self, PyObject *arg
 }
 
 #define wxCommandEvent_GetString(_swigobj)  (_swigobj->GetString())
-static PyObject *_wrap_wxCommandEvent_GetString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCommandEvent_GetString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxCommandEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_GetString",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCommandEvent_GetString",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -753,14 +775,15 @@ static PyObject *_wrap_wxCommandEvent_GetString(PyObject *self, PyObject *args)
 }
 
 #define wxCommandEvent_IsSelection(_swigobj)  (_swigobj->IsSelection())
-static PyObject *_wrap_wxCommandEvent_IsSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCommandEvent_IsSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxCommandEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCommandEvent_IsSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCommandEvent_IsSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -795,14 +818,15 @@ static void *SwigwxScrollEventTowxEvent(void *ptr) {
 }
 
 #define wxScrollEvent_GetOrientation(_swigobj)  (_swigobj->GetOrientation())
-static PyObject *_wrap_wxScrollEvent_GetOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollEvent_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollEvent_GetOrientation",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollEvent_GetOrientation",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -821,14 +845,15 @@ static PyObject *_wrap_wxScrollEvent_GetOrientation(PyObject *self, PyObject *ar
 }
 
 #define wxScrollEvent_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxScrollEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrollEvent_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrollEvent_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -879,14 +904,15 @@ static void *SwigwxMouseEventTowxEvent(void *ptr) {
 }
 
 #define wxMouseEvent_IsButton(_swigobj)  (_swigobj->IsButton())
-static PyObject *_wrap_wxMouseEvent_IsButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_IsButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_IsButton",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_IsButton",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -905,15 +931,16 @@ static PyObject *_wrap_wxMouseEvent_IsButton(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_ButtonDown(_swigobj,_swigarg0)  (_swigobj->ButtonDown(_swigarg0))
-static PyObject *_wrap_wxMouseEvent_ButtonDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_ButtonDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1 = (int ) -1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxMouseEvent_ButtonDown",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMouseEvent_ButtonDown",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -932,15 +959,16 @@ static PyObject *_wrap_wxMouseEvent_ButtonDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_ButtonDClick(_swigobj,_swigarg0)  (_swigobj->ButtonDClick(_swigarg0))
-static PyObject *_wrap_wxMouseEvent_ButtonDClick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_ButtonDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1 = (int ) -1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxMouseEvent_ButtonDClick",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMouseEvent_ButtonDClick",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -959,15 +987,16 @@ static PyObject *_wrap_wxMouseEvent_ButtonDClick(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_ButtonUp(_swigobj,_swigarg0)  (_swigobj->ButtonUp(_swigarg0))
-static PyObject *_wrap_wxMouseEvent_ButtonUp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_ButtonUp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1 = (int ) -1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxMouseEvent_ButtonUp",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMouseEvent_ButtonUp",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -986,15 +1015,16 @@ static PyObject *_wrap_wxMouseEvent_ButtonUp(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_Button(_swigobj,_swigarg0)  (_swigobj->Button(_swigarg0))
-static PyObject *_wrap_wxMouseEvent_Button(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_Button(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMouseEvent_Button",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMouseEvent_Button",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1013,15 +1043,16 @@ static PyObject *_wrap_wxMouseEvent_Button(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_ButtonIsDown(_swigobj,_swigarg0)  (_swigobj->ButtonIsDown(_swigarg0))
-static PyObject *_wrap_wxMouseEvent_ButtonIsDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_ButtonIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMouseEvent_ButtonIsDown",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMouseEvent_ButtonIsDown",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1040,14 +1071,15 @@ static PyObject *_wrap_wxMouseEvent_ButtonIsDown(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_ControlDown(_swigobj)  (_swigobj->ControlDown())
-static PyObject *_wrap_wxMouseEvent_ControlDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_ControlDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_ControlDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1066,14 +1098,15 @@ static PyObject *_wrap_wxMouseEvent_ControlDown(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_MetaDown(_swigobj)  (_swigobj->MetaDown())
-static PyObject *_wrap_wxMouseEvent_MetaDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_MetaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MetaDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_MetaDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1092,14 +1125,15 @@ static PyObject *_wrap_wxMouseEvent_MetaDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_AltDown(_swigobj)  (_swigobj->AltDown())
-static PyObject *_wrap_wxMouseEvent_AltDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_AltDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_AltDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_AltDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1118,14 +1152,15 @@ static PyObject *_wrap_wxMouseEvent_AltDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_ShiftDown(_swigobj)  (_swigobj->ShiftDown())
-static PyObject *_wrap_wxMouseEvent_ShiftDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_ShiftDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_ShiftDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1144,14 +1179,15 @@ static PyObject *_wrap_wxMouseEvent_ShiftDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_LeftDown(_swigobj)  (_swigobj->LeftDown())
-static PyObject *_wrap_wxMouseEvent_LeftDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_LeftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_LeftDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1170,14 +1206,15 @@ static PyObject *_wrap_wxMouseEvent_LeftDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_MiddleDown(_swigobj)  (_swigobj->MiddleDown())
-static PyObject *_wrap_wxMouseEvent_MiddleDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_MiddleDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_MiddleDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1196,14 +1233,15 @@ static PyObject *_wrap_wxMouseEvent_MiddleDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_RightDown(_swigobj)  (_swigobj->RightDown())
-static PyObject *_wrap_wxMouseEvent_RightDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_RightDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_RightDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1222,14 +1260,15 @@ static PyObject *_wrap_wxMouseEvent_RightDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_LeftUp(_swigobj)  (_swigobj->LeftUp())
-static PyObject *_wrap_wxMouseEvent_LeftUp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_LeftUp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftUp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_LeftUp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1248,14 +1287,15 @@ static PyObject *_wrap_wxMouseEvent_LeftUp(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_MiddleUp(_swigobj)  (_swigobj->MiddleUp())
-static PyObject *_wrap_wxMouseEvent_MiddleUp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_MiddleUp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleUp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_MiddleUp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1274,14 +1314,15 @@ static PyObject *_wrap_wxMouseEvent_MiddleUp(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_RightUp(_swigobj)  (_swigobj->RightUp())
-static PyObject *_wrap_wxMouseEvent_RightUp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_RightUp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightUp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_RightUp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1300,14 +1341,15 @@ static PyObject *_wrap_wxMouseEvent_RightUp(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_LeftDClick(_swigobj)  (_swigobj->LeftDClick())
-static PyObject *_wrap_wxMouseEvent_LeftDClick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_LeftDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftDClick",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_LeftDClick",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1326,14 +1368,15 @@ static PyObject *_wrap_wxMouseEvent_LeftDClick(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_MiddleDClick(_swigobj)  (_swigobj->MiddleDClick())
-static PyObject *_wrap_wxMouseEvent_MiddleDClick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_MiddleDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleDClick",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_MiddleDClick",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1352,14 +1395,15 @@ static PyObject *_wrap_wxMouseEvent_MiddleDClick(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_RightDClick(_swigobj)  (_swigobj->RightDClick())
-static PyObject *_wrap_wxMouseEvent_RightDClick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_RightDClick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightDClick",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_RightDClick",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1378,14 +1422,15 @@ static PyObject *_wrap_wxMouseEvent_RightDClick(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_LeftIsDown(_swigobj)  (_swigobj->LeftIsDown())
-static PyObject *_wrap_wxMouseEvent_LeftIsDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_LeftIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_LeftIsDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_LeftIsDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1404,14 +1449,15 @@ static PyObject *_wrap_wxMouseEvent_LeftIsDown(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_MiddleIsDown(_swigobj)  (_swigobj->MiddleIsDown())
-static PyObject *_wrap_wxMouseEvent_MiddleIsDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_MiddleIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_MiddleIsDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_MiddleIsDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1430,14 +1476,15 @@ static PyObject *_wrap_wxMouseEvent_MiddleIsDown(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_RightIsDown(_swigobj)  (_swigobj->RightIsDown())
-static PyObject *_wrap_wxMouseEvent_RightIsDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_RightIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_RightIsDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_RightIsDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1456,14 +1503,15 @@ static PyObject *_wrap_wxMouseEvent_RightIsDown(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_Dragging(_swigobj)  (_swigobj->Dragging())
-static PyObject *_wrap_wxMouseEvent_Dragging(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_Dragging(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Dragging",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_Dragging",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1482,14 +1530,15 @@ static PyObject *_wrap_wxMouseEvent_Dragging(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_Moving(_swigobj)  (_swigobj->Moving())
-static PyObject *_wrap_wxMouseEvent_Moving(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_Moving(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Moving",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_Moving",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1508,14 +1557,15 @@ static PyObject *_wrap_wxMouseEvent_Moving(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_Entering(_swigobj)  (_swigobj->Entering())
-static PyObject *_wrap_wxMouseEvent_Entering(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_Entering(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Entering",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_Entering",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1534,14 +1584,15 @@ static PyObject *_wrap_wxMouseEvent_Entering(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_Leaving(_swigobj)  (_swigobj->Leaving())
-static PyObject *_wrap_wxMouseEvent_Leaving(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_Leaving(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Leaving",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_Leaving",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1560,7 +1611,7 @@ static PyObject *_wrap_wxMouseEvent_Leaving(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_Position(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Position(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMouseEvent_Position(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_Position(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMouseEvent * _arg0;
     long * _arg1;
@@ -1568,6 +1619,7 @@ static PyObject *_wrap_wxMouseEvent_Position(PyObject *self, PyObject *args) {
     long * _arg2;
     long  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -1576,7 +1628,7 @@ static PyObject *_wrap_wxMouseEvent_Position(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_Position",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_Position",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1606,15 +1658,16 @@ static PyObject *_wrap_wxMouseEvent_Position(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxMouseEvent_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1634,17 +1687,18 @@ static PyObject *_wrap_wxMouseEvent_GetPosition(PyObject *self, PyObject *args)
 }
 
 #define wxMouseEvent_GetLogicalPosition(_swigobj,_swigarg0)  (_swigobj->GetLogicalPosition(_swigarg0))
-static PyObject *_wrap_wxMouseEvent_GetLogicalPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_GetLogicalPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxMouseEvent * _arg0;
     wxDC * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","dc", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMouseEvent_GetLogicalPosition",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMouseEvent_GetLogicalPosition",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1671,14 +1725,15 @@ static PyObject *_wrap_wxMouseEvent_GetLogicalPosition(PyObject *self, PyObject
 }
 
 #define wxMouseEvent_GetX(_swigobj)  (_swigobj->GetX())
-static PyObject *_wrap_wxMouseEvent_GetX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_GetX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_GetX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1697,14 +1752,15 @@ static PyObject *_wrap_wxMouseEvent_GetX(PyObject *self, PyObject *args) {
 }
 
 #define wxMouseEvent_GetY(_swigobj)  (_swigobj->GetY())
-static PyObject *_wrap_wxMouseEvent_GetY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMouseEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxMouseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMouseEvent_GetY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMouseEvent_GetY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1731,14 +1787,15 @@ static void *SwigwxKeyEventTowxEvent(void *ptr) {
 }
 
 #define wxKeyEvent_ControlDown(_swigobj)  (_swigobj->ControlDown())
-static PyObject *_wrap_wxKeyEvent_ControlDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxKeyEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_ControlDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxKeyEvent_ControlDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1757,14 +1814,15 @@ static PyObject *_wrap_wxKeyEvent_ControlDown(PyObject *self, PyObject *args) {
 }
 
 #define wxKeyEvent_MetaDown(_swigobj)  (_swigobj->MetaDown())
-static PyObject *_wrap_wxKeyEvent_MetaDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxKeyEvent_MetaDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_MetaDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxKeyEvent_MetaDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1783,14 +1841,15 @@ static PyObject *_wrap_wxKeyEvent_MetaDown(PyObject *self, PyObject *args) {
 }
 
 #define wxKeyEvent_AltDown(_swigobj)  (_swigobj->AltDown())
-static PyObject *_wrap_wxKeyEvent_AltDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxKeyEvent_AltDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_AltDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxKeyEvent_AltDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1809,14 +1868,15 @@ static PyObject *_wrap_wxKeyEvent_AltDown(PyObject *self, PyObject *args) {
 }
 
 #define wxKeyEvent_ShiftDown(_swigobj)  (_swigobj->ShiftDown())
-static PyObject *_wrap_wxKeyEvent_ShiftDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxKeyEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxKeyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_ShiftDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxKeyEvent_ShiftDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1835,14 +1895,15 @@ static PyObject *_wrap_wxKeyEvent_ShiftDown(PyObject *self, PyObject *args) {
 }
 
 #define wxKeyEvent_KeyCode(_swigobj)  (_swigobj->KeyCode())
-static PyObject *_wrap_wxKeyEvent_KeyCode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxKeyEvent_KeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxKeyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxKeyEvent_KeyCode",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxKeyEvent_KeyCode",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1869,15 +1930,16 @@ static void *SwigwxMoveEventTowxEvent(void *ptr) {
 }
 
 #define wxMoveEvent_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxMoveEvent_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMoveEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxMoveEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMoveEvent_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMoveEvent_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1913,15 +1975,16 @@ static void *SwigwxEraseEventTowxEvent(void *ptr) {
 }
 
 #define wxEraseEvent_GetDC(_swigobj)  (_swigobj->GetDC())
-static PyObject *_wrap_wxEraseEvent_GetDC(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEraseEvent_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDC * _result;
     wxEraseEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxEraseEvent_GetDC",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxEraseEvent_GetDC",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1962,14 +2025,15 @@ static void *SwigwxActivateEventTowxEvent(void *ptr) {
 }
 
 #define wxActivateEvent_GetActive(_swigobj)  (_swigobj->GetActive())
-static PyObject *_wrap_wxActivateEvent_GetActive(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxActivateEvent_GetActive(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxActivateEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxActivateEvent_GetActive",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxActivateEvent_GetActive",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2004,14 +2068,15 @@ static void *SwigwxMenuEventTowxEvent(void *ptr) {
 }
 
 #define wxMenuEvent_GetMenuId(_swigobj)  (_swigobj->GetMenuId())
-static PyObject *_wrap_wxMenuEvent_GetMenuId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuEvent_GetMenuId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMenuEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuEvent_GetMenuId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuEvent_GetMenuId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2038,15 +2103,16 @@ static void *SwigwxShowEventTowxEvent(void *ptr) {
 }
 
 #define wxShowEvent_SetShow(_swigobj,_swigarg0)  (_swigobj->SetShow(_swigarg0))
-static PyObject *_wrap_wxShowEvent_SetShow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxShowEvent_SetShow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxShowEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","show", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxShowEvent_SetShow",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxShowEvent_SetShow",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2067,14 +2133,15 @@ static PyObject *_wrap_wxShowEvent_SetShow(PyObject *self, PyObject *args) {
 }
 
 #define wxShowEvent_GetShow(_swigobj)  (_swigobj->GetShow())
-static PyObject *_wrap_wxShowEvent_GetShow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxShowEvent_GetShow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxShowEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxShowEvent_GetShow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxShowEvent_GetShow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2117,15 +2184,16 @@ static void *SwigwxJoystickEventTowxEvent(void *ptr) {
 }
 
 #define wxJoystickEvent_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxJoystickEvent_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2145,14 +2213,15 @@ static PyObject *_wrap_wxJoystickEvent_GetPosition(PyObject *self, PyObject *arg
 }
 
 #define wxJoystickEvent_GetZPosition(_swigobj)  (_swigobj->GetZPosition())
-static PyObject *_wrap_wxJoystickEvent_GetZPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_GetZPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetZPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_GetZPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2171,14 +2240,15 @@ static PyObject *_wrap_wxJoystickEvent_GetZPosition(PyObject *self, PyObject *ar
 }
 
 #define wxJoystickEvent_GetButtonState(_swigobj)  (_swigobj->GetButtonState())
-static PyObject *_wrap_wxJoystickEvent_GetButtonState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_GetButtonState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetButtonState",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_GetButtonState",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2197,14 +2267,15 @@ static PyObject *_wrap_wxJoystickEvent_GetButtonState(PyObject *self, PyObject *
 }
 
 #define wxJoystickEvent_GetButtonChange(_swigobj)  (_swigobj->GetButtonChange())
-static PyObject *_wrap_wxJoystickEvent_GetButtonChange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_GetButtonChange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetButtonChange",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_GetButtonChange",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2223,14 +2294,15 @@ static PyObject *_wrap_wxJoystickEvent_GetButtonChange(PyObject *self, PyObject
 }
 
 #define wxJoystickEvent_GetJoystick(_swigobj)  (_swigobj->GetJoystick())
-static PyObject *_wrap_wxJoystickEvent_GetJoystick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_GetJoystick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_GetJoystick",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_GetJoystick",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2249,14 +2321,15 @@ static PyObject *_wrap_wxJoystickEvent_GetJoystick(PyObject *self, PyObject *arg
 }
 
 #define wxJoystickEvent_SetJoystick(_swigobj,_swigarg0)  (_swigobj->SetJoystick(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_SetJoystick(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_SetJoystick(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","stick", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetJoystick",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxJoystickEvent_SetJoystick",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2276,14 +2349,15 @@ static PyObject *_wrap_wxJoystickEvent_SetJoystick(PyObject *self, PyObject *arg
 }
 
 #define wxJoystickEvent_SetButtonState(_swigobj,_swigarg0)  (_swigobj->SetButtonState(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_SetButtonState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_SetButtonState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","state", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetButtonState",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxJoystickEvent_SetButtonState",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2303,14 +2377,15 @@ static PyObject *_wrap_wxJoystickEvent_SetButtonState(PyObject *self, PyObject *
 }
 
 #define wxJoystickEvent_SetButtonChange(_swigobj,_swigarg0)  (_swigobj->SetButtonChange(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_SetButtonChange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_SetButtonChange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","change", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetButtonChange",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxJoystickEvent_SetButtonChange",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2330,15 +2405,16 @@ static PyObject *_wrap_wxJoystickEvent_SetButtonChange(PyObject *self, PyObject
 }
 
 #define wxJoystickEvent_SetPosition(_swigobj,_swigarg0)  (_swigobj->SetPosition(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_SetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxJoystickEvent_SetPosition",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxJoystickEvent_SetPosition",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2365,14 +2441,15 @@ static PyObject *_wrap_wxJoystickEvent_SetPosition(PyObject *self, PyObject *arg
 }
 
 #define wxJoystickEvent_SetZPosition(_swigobj,_swigarg0)  (_swigobj->SetZPosition(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_SetZPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_SetZPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxJoystickEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","zPos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxJoystickEvent_SetZPosition",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxJoystickEvent_SetZPosition",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2392,14 +2469,15 @@ static PyObject *_wrap_wxJoystickEvent_SetZPosition(PyObject *self, PyObject *ar
 }
 
 #define wxJoystickEvent_IsButton(_swigobj)  (_swigobj->IsButton())
-static PyObject *_wrap_wxJoystickEvent_IsButton(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_IsButton(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_IsButton",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_IsButton",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2418,14 +2496,15 @@ static PyObject *_wrap_wxJoystickEvent_IsButton(PyObject *self, PyObject *args)
 }
 
 #define wxJoystickEvent_IsMove(_swigobj)  (_swigobj->IsMove())
-static PyObject *_wrap_wxJoystickEvent_IsMove(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_IsMove(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_IsMove",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_IsMove",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2444,14 +2523,15 @@ static PyObject *_wrap_wxJoystickEvent_IsMove(PyObject *self, PyObject *args) {
 }
 
 #define wxJoystickEvent_IsZMove(_swigobj)  (_swigobj->IsZMove())
-static PyObject *_wrap_wxJoystickEvent_IsZMove(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_IsZMove(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxJoystickEvent_IsZMove",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxJoystickEvent_IsZMove",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2470,15 +2550,16 @@ static PyObject *_wrap_wxJoystickEvent_IsZMove(PyObject *self, PyObject *args) {
 }
 
 #define wxJoystickEvent_ButtonDown(_swigobj,_swigarg0)  (_swigobj->ButtonDown(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_ButtonDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_ButtonDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     int  _arg1 = (int ) wxJOY_BUTTON_ANY;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxJoystickEvent_ButtonDown",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxJoystickEvent_ButtonDown",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2497,15 +2578,16 @@ static PyObject *_wrap_wxJoystickEvent_ButtonDown(PyObject *self, PyObject *args
 }
 
 #define wxJoystickEvent_ButtonUp(_swigobj,_swigarg0)  (_swigobj->ButtonUp(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_ButtonUp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_ButtonUp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     int  _arg1 = (int ) wxJOY_BUTTON_ANY;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxJoystickEvent_ButtonUp",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxJoystickEvent_ButtonUp",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2524,15 +2606,16 @@ static PyObject *_wrap_wxJoystickEvent_ButtonUp(PyObject *self, PyObject *args)
 }
 
 #define wxJoystickEvent_ButtonIsDown(_swigobj,_swigarg0)  (_swigobj->ButtonIsDown(_swigarg0))
-static PyObject *_wrap_wxJoystickEvent_ButtonIsDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxJoystickEvent_ButtonIsDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxJoystickEvent * _arg0;
     int  _arg1 = (int ) wxJOY_BUTTON_ANY;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","but", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxJoystickEvent_ButtonIsDown",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxJoystickEvent_ButtonIsDown",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2559,15 +2642,16 @@ static void *SwigwxDropFilesEventTowxEvent(void *ptr) {
 }
 
 #define wxDropFilesEvent_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxDropFilesEvent_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDropFilesEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxDropFilesEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDropFilesEvent_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDropFilesEvent_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2587,14 +2671,15 @@ static PyObject *_wrap_wxDropFilesEvent_GetPosition(PyObject *self, PyObject *ar
 }
 
 #define wxDropFilesEvent_GetNumberOfFiles(_swigobj)  (_swigobj->GetNumberOfFiles())
-static PyObject *_wrap_wxDropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDropFilesEvent_GetNumberOfFiles(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxDropFilesEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDropFilesEvent_GetNumberOfFiles",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDropFilesEvent_GetNumberOfFiles",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2627,14 +2712,15 @@ static PyObject * wxDropFilesEvent_GetFiles(wxDropFilesEvent *self) {
             }
             return list;
         }
-static PyObject *_wrap_wxDropFilesEvent_GetFiles(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDropFilesEvent_GetFiles(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxDropFilesEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDropFilesEvent_GetFiles",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDropFilesEvent_GetFiles",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2663,15 +2749,16 @@ static void *SwigwxIdleEventTowxEvent(void *ptr) {
 }
 
 #define wxIdleEvent_RequestMore(_swigobj,_swigarg0)  (_swigobj->RequestMore(_swigarg0))
-static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIdleEvent * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","needMore", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxIdleEvent_RequestMore",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxIdleEvent_RequestMore",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2692,14 +2779,15 @@ static PyObject *_wrap_wxIdleEvent_RequestMore(PyObject *self, PyObject *args) {
 }
 
 #define wxIdleEvent_MoreRequested(_swigobj)  (_swigobj->MoreRequested())
-static PyObject *_wrap_wxIdleEvent_MoreRequested(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIdleEvent_MoreRequested(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxIdleEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxIdleEvent_MoreRequested",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIdleEvent_MoreRequested",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2726,14 +2814,15 @@ static void *SwigwxUpdateUIEventTowxEvent(void *ptr) {
 }
 
 #define wxUpdateUIEvent_GetChecked(_swigobj)  (_swigobj->GetChecked())
-static PyObject *_wrap_wxUpdateUIEvent_GetChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_GetChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetChecked",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxUpdateUIEvent_GetChecked",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2752,14 +2841,15 @@ static PyObject *_wrap_wxUpdateUIEvent_GetChecked(PyObject *self, PyObject *args
 }
 
 #define wxUpdateUIEvent_GetEnabled(_swigobj)  (_swigobj->GetEnabled())
-static PyObject *_wrap_wxUpdateUIEvent_GetEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_GetEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetEnabled",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxUpdateUIEvent_GetEnabled",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2778,14 +2868,15 @@ static PyObject *_wrap_wxUpdateUIEvent_GetEnabled(PyObject *self, PyObject *args
 }
 
 #define wxUpdateUIEvent_GetText(_swigobj)  (_swigobj->GetText())
-static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetText",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxUpdateUIEvent_GetText",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2809,14 +2900,15 @@ static PyObject *_wrap_wxUpdateUIEvent_GetText(PyObject *self, PyObject *args) {
 }
 
 #define wxUpdateUIEvent_GetSetText(_swigobj)  (_swigobj->GetSetText())
-static PyObject *_wrap_wxUpdateUIEvent_GetSetText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_GetSetText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetSetText",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxUpdateUIEvent_GetSetText",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2835,14 +2927,15 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetText(PyObject *self, PyObject *args
 }
 
 #define wxUpdateUIEvent_GetSetChecked(_swigobj)  (_swigobj->GetSetChecked())
-static PyObject *_wrap_wxUpdateUIEvent_GetSetChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_GetSetChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetSetChecked",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxUpdateUIEvent_GetSetChecked",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2861,14 +2954,15 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetChecked(PyObject *self, PyObject *a
 }
 
 #define wxUpdateUIEvent_GetSetEnabled(_swigobj)  (_swigobj->GetSetEnabled())
-static PyObject *_wrap_wxUpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxUpdateUIEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxUpdateUIEvent_GetSetEnabled",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxUpdateUIEvent_GetSetEnabled",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2887,15 +2981,16 @@ static PyObject *_wrap_wxUpdateUIEvent_GetSetEnabled(PyObject *self, PyObject *a
 }
 
 #define wxUpdateUIEvent_Check(_swigobj,_swigarg0)  (_swigobj->Check(_swigarg0))
-static PyObject *_wrap_wxUpdateUIEvent_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","check", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxUpdateUIEvent_Check",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxUpdateUIEvent_Check",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2916,15 +3011,16 @@ static PyObject *_wrap_wxUpdateUIEvent_Check(PyObject *self, PyObject *args) {
 }
 
 #define wxUpdateUIEvent_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
-static PyObject *_wrap_wxUpdateUIEvent_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxUpdateUIEvent_Enable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxUpdateUIEvent_Enable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2945,15 +3041,16 @@ static PyObject *_wrap_wxUpdateUIEvent_Enable(PyObject *self, PyObject *args) {
 }
 
 #define wxUpdateUIEvent_SetText(_swigobj,_swigarg0)  (_swigobj->SetText(_swigarg0))
-static PyObject *_wrap_wxUpdateUIEvent_SetText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxUpdateUIEvent_SetText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxUpdateUIEvent * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxUpdateUIEvent_SetText",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxUpdateUIEvent_SetText",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3008,16 +3105,17 @@ static void *SwigwxPyEventTowxEvent(void *ptr) {
 }
 
 #define new_wxPyEvent(_swigarg0,_swigarg1) (new wxPyEvent(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyEvent * _result;
     wxEventType  _arg0 = (wxEventType ) wxEVT_NULL;
     PyObject * _arg1 = (PyObject *) Py_None;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "commandType","userData", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|iO:new_wxPyEvent",&_arg0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iO:new_wxPyEvent",_kwnames,&_arg0,&_obj1)) 
         return NULL;
     if (_obj1)
 {
@@ -3039,13 +3137,14 @@ static PyObject *_wrap_new_wxPyEvent(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxPyEvent(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPyEvent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPyEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPyEvent",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPyEvent",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3065,15 +3164,16 @@ static PyObject *_wrap_delete_wxPyEvent(PyObject *self, PyObject *args) {
 }
 
 #define wxPyEvent_SetUserData(_swigobj,_swigarg0)  (_swigobj->SetUserData(_swigarg0))
-static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyEvent * _arg0;
     PyObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","userData", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPyEvent_SetUserData",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyEvent_SetUserData",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3096,14 +3196,15 @@ static PyObject *_wrap_wxPyEvent_SetUserData(PyObject *self, PyObject *args) {
 }
 
 #define wxPyEvent_GetUserData(_swigobj)  (_swigobj->GetUserData())
-static PyObject *_wrap_wxPyEvent_GetUserData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyEvent_GetUserData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxPyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyEvent_GetUserData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyEvent_GetUserData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3140,14 +3241,15 @@ static void *SwigwxNotifyEventTowxEvent(void *ptr) {
 }
 
 #define wxNotifyEvent_IsAllowed(_swigobj)  (_swigobj->IsAllowed())
-static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotifyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotifyEvent_IsAllowed",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotifyEvent_IsAllowed",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3166,13 +3268,14 @@ static PyObject *_wrap_wxNotifyEvent_IsAllowed(PyObject *self, PyObject *args) {
 }
 
 #define wxNotifyEvent_Veto(_swigobj)  (_swigobj->Veto())
-static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxNotifyEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotifyEvent_Veto",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotifyEvent_Veto",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3192,109 +3295,109 @@ static PyObject *_wrap_wxNotifyEvent_Veto(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef eventscMethods[] = {
-	 { "wxNotifyEvent_Veto", _wrap_wxNotifyEvent_Veto, METH_VARARGS },
-	 { "wxNotifyEvent_IsAllowed", _wrap_wxNotifyEvent_IsAllowed, METH_VARARGS },
-	 { "wxPyEvent_GetUserData", _wrap_wxPyEvent_GetUserData, METH_VARARGS },
-	 { "wxPyEvent_SetUserData", _wrap_wxPyEvent_SetUserData, METH_VARARGS },
-	 { "delete_wxPyEvent", _wrap_delete_wxPyEvent, METH_VARARGS },
-	 { "new_wxPyEvent", _wrap_new_wxPyEvent, METH_VARARGS },
-	 { "wxUpdateUIEvent_SetText", _wrap_wxUpdateUIEvent_SetText, METH_VARARGS },
-	 { "wxUpdateUIEvent_Enable", _wrap_wxUpdateUIEvent_Enable, METH_VARARGS },
-	 { "wxUpdateUIEvent_Check", _wrap_wxUpdateUIEvent_Check, METH_VARARGS },
-	 { "wxUpdateUIEvent_GetSetEnabled", _wrap_wxUpdateUIEvent_GetSetEnabled, METH_VARARGS },
-	 { "wxUpdateUIEvent_GetSetChecked", _wrap_wxUpdateUIEvent_GetSetChecked, METH_VARARGS },
-	 { "wxUpdateUIEvent_GetSetText", _wrap_wxUpdateUIEvent_GetSetText, METH_VARARGS },
-	 { "wxUpdateUIEvent_GetText", _wrap_wxUpdateUIEvent_GetText, METH_VARARGS },
-	 { "wxUpdateUIEvent_GetEnabled", _wrap_wxUpdateUIEvent_GetEnabled, METH_VARARGS },
-	 { "wxUpdateUIEvent_GetChecked", _wrap_wxUpdateUIEvent_GetChecked, METH_VARARGS },
-	 { "wxIdleEvent_MoreRequested", _wrap_wxIdleEvent_MoreRequested, METH_VARARGS },
-	 { "wxIdleEvent_RequestMore", _wrap_wxIdleEvent_RequestMore, METH_VARARGS },
-	 { "wxDropFilesEvent_GetFiles", _wrap_wxDropFilesEvent_GetFiles, METH_VARARGS },
-	 { "wxDropFilesEvent_GetNumberOfFiles", _wrap_wxDropFilesEvent_GetNumberOfFiles, METH_VARARGS },
-	 { "wxDropFilesEvent_GetPosition", _wrap_wxDropFilesEvent_GetPosition, METH_VARARGS },
-	 { "wxJoystickEvent_ButtonIsDown", _wrap_wxJoystickEvent_ButtonIsDown, METH_VARARGS },
-	 { "wxJoystickEvent_ButtonUp", _wrap_wxJoystickEvent_ButtonUp, METH_VARARGS },
-	 { "wxJoystickEvent_ButtonDown", _wrap_wxJoystickEvent_ButtonDown, METH_VARARGS },
-	 { "wxJoystickEvent_IsZMove", _wrap_wxJoystickEvent_IsZMove, METH_VARARGS },
-	 { "wxJoystickEvent_IsMove", _wrap_wxJoystickEvent_IsMove, METH_VARARGS },
-	 { "wxJoystickEvent_IsButton", _wrap_wxJoystickEvent_IsButton, METH_VARARGS },
-	 { "wxJoystickEvent_SetZPosition", _wrap_wxJoystickEvent_SetZPosition, METH_VARARGS },
-	 { "wxJoystickEvent_SetPosition", _wrap_wxJoystickEvent_SetPosition, METH_VARARGS },
-	 { "wxJoystickEvent_SetButtonChange", _wrap_wxJoystickEvent_SetButtonChange, METH_VARARGS },
-	 { "wxJoystickEvent_SetButtonState", _wrap_wxJoystickEvent_SetButtonState, METH_VARARGS },
-	 { "wxJoystickEvent_SetJoystick", _wrap_wxJoystickEvent_SetJoystick, METH_VARARGS },
-	 { "wxJoystickEvent_GetJoystick", _wrap_wxJoystickEvent_GetJoystick, METH_VARARGS },
-	 { "wxJoystickEvent_GetButtonChange", _wrap_wxJoystickEvent_GetButtonChange, METH_VARARGS },
-	 { "wxJoystickEvent_GetButtonState", _wrap_wxJoystickEvent_GetButtonState, METH_VARARGS },
-	 { "wxJoystickEvent_GetZPosition", _wrap_wxJoystickEvent_GetZPosition, METH_VARARGS },
-	 { "wxJoystickEvent_GetPosition", _wrap_wxJoystickEvent_GetPosition, METH_VARARGS },
-	 { "wxShowEvent_GetShow", _wrap_wxShowEvent_GetShow, METH_VARARGS },
-	 { "wxShowEvent_SetShow", _wrap_wxShowEvent_SetShow, METH_VARARGS },
-	 { "wxMenuEvent_GetMenuId", _wrap_wxMenuEvent_GetMenuId, METH_VARARGS },
-	 { "wxActivateEvent_GetActive", _wrap_wxActivateEvent_GetActive, METH_VARARGS },
-	 { "wxEraseEvent_GetDC", _wrap_wxEraseEvent_GetDC, METH_VARARGS },
-	 { "wxMoveEvent_GetPosition", _wrap_wxMoveEvent_GetPosition, METH_VARARGS },
-	 { "wxKeyEvent_KeyCode", _wrap_wxKeyEvent_KeyCode, METH_VARARGS },
-	 { "wxKeyEvent_ShiftDown", _wrap_wxKeyEvent_ShiftDown, METH_VARARGS },
-	 { "wxKeyEvent_AltDown", _wrap_wxKeyEvent_AltDown, METH_VARARGS },
-	 { "wxKeyEvent_MetaDown", _wrap_wxKeyEvent_MetaDown, METH_VARARGS },
-	 { "wxKeyEvent_ControlDown", _wrap_wxKeyEvent_ControlDown, METH_VARARGS },
-	 { "wxMouseEvent_GetY", _wrap_wxMouseEvent_GetY, METH_VARARGS },
-	 { "wxMouseEvent_GetX", _wrap_wxMouseEvent_GetX, METH_VARARGS },
-	 { "wxMouseEvent_GetLogicalPosition", _wrap_wxMouseEvent_GetLogicalPosition, METH_VARARGS },
-	 { "wxMouseEvent_GetPosition", _wrap_wxMouseEvent_GetPosition, METH_VARARGS },
-	 { "wxMouseEvent_Position", _wrap_wxMouseEvent_Position, METH_VARARGS },
-	 { "wxMouseEvent_Leaving", _wrap_wxMouseEvent_Leaving, METH_VARARGS },
-	 { "wxMouseEvent_Entering", _wrap_wxMouseEvent_Entering, METH_VARARGS },
-	 { "wxMouseEvent_Moving", _wrap_wxMouseEvent_Moving, METH_VARARGS },
-	 { "wxMouseEvent_Dragging", _wrap_wxMouseEvent_Dragging, METH_VARARGS },
-	 { "wxMouseEvent_RightIsDown", _wrap_wxMouseEvent_RightIsDown, METH_VARARGS },
-	 { "wxMouseEvent_MiddleIsDown", _wrap_wxMouseEvent_MiddleIsDown, METH_VARARGS },
-	 { "wxMouseEvent_LeftIsDown", _wrap_wxMouseEvent_LeftIsDown, METH_VARARGS },
-	 { "wxMouseEvent_RightDClick", _wrap_wxMouseEvent_RightDClick, METH_VARARGS },
-	 { "wxMouseEvent_MiddleDClick", _wrap_wxMouseEvent_MiddleDClick, METH_VARARGS },
-	 { "wxMouseEvent_LeftDClick", _wrap_wxMouseEvent_LeftDClick, METH_VARARGS },
-	 { "wxMouseEvent_RightUp", _wrap_wxMouseEvent_RightUp, METH_VARARGS },
-	 { "wxMouseEvent_MiddleUp", _wrap_wxMouseEvent_MiddleUp, METH_VARARGS },
-	 { "wxMouseEvent_LeftUp", _wrap_wxMouseEvent_LeftUp, METH_VARARGS },
-	 { "wxMouseEvent_RightDown", _wrap_wxMouseEvent_RightDown, METH_VARARGS },
-	 { "wxMouseEvent_MiddleDown", _wrap_wxMouseEvent_MiddleDown, METH_VARARGS },
-	 { "wxMouseEvent_LeftDown", _wrap_wxMouseEvent_LeftDown, METH_VARARGS },
-	 { "wxMouseEvent_ShiftDown", _wrap_wxMouseEvent_ShiftDown, METH_VARARGS },
-	 { "wxMouseEvent_AltDown", _wrap_wxMouseEvent_AltDown, METH_VARARGS },
-	 { "wxMouseEvent_MetaDown", _wrap_wxMouseEvent_MetaDown, METH_VARARGS },
-	 { "wxMouseEvent_ControlDown", _wrap_wxMouseEvent_ControlDown, METH_VARARGS },
-	 { "wxMouseEvent_ButtonIsDown", _wrap_wxMouseEvent_ButtonIsDown, METH_VARARGS },
-	 { "wxMouseEvent_Button", _wrap_wxMouseEvent_Button, METH_VARARGS },
-	 { "wxMouseEvent_ButtonUp", _wrap_wxMouseEvent_ButtonUp, METH_VARARGS },
-	 { "wxMouseEvent_ButtonDClick", _wrap_wxMouseEvent_ButtonDClick, METH_VARARGS },
-	 { "wxMouseEvent_ButtonDown", _wrap_wxMouseEvent_ButtonDown, METH_VARARGS },
-	 { "wxMouseEvent_IsButton", _wrap_wxMouseEvent_IsButton, METH_VARARGS },
-	 { "wxScrollEvent_GetPosition", _wrap_wxScrollEvent_GetPosition, METH_VARARGS },
-	 { "wxScrollEvent_GetOrientation", _wrap_wxScrollEvent_GetOrientation, METH_VARARGS },
-	 { "wxCommandEvent_IsSelection", _wrap_wxCommandEvent_IsSelection, METH_VARARGS },
-	 { "wxCommandEvent_GetString", _wrap_wxCommandEvent_GetString, METH_VARARGS },
-	 { "wxCommandEvent_GetSelection", _wrap_wxCommandEvent_GetSelection, METH_VARARGS },
-	 { "wxCommandEvent_GetInt", _wrap_wxCommandEvent_GetInt, METH_VARARGS },
-	 { "wxCommandEvent_GetExtraLong", _wrap_wxCommandEvent_GetExtraLong, METH_VARARGS },
-	 { "wxCommandEvent_Checked", _wrap_wxCommandEvent_Checked, METH_VARARGS },
-	 { "wxCloseEvent_SetCanVeto", _wrap_wxCloseEvent_SetCanVeto, METH_VARARGS },
-	 { "wxCloseEvent_GetVeto", _wrap_wxCloseEvent_GetVeto, METH_VARARGS },
-	 { "wxCloseEvent_CanVeto", _wrap_wxCloseEvent_CanVeto, METH_VARARGS },
-	 { "wxCloseEvent_Veto", _wrap_wxCloseEvent_Veto, METH_VARARGS },
-	 { "wxCloseEvent_GetLoggingOff", _wrap_wxCloseEvent_GetLoggingOff, METH_VARARGS },
-	 { "wxCloseEvent_SetLoggingOff", _wrap_wxCloseEvent_SetLoggingOff, METH_VARARGS },
-	 { "wxSizeEvent_GetSize", _wrap_wxSizeEvent_GetSize, METH_VARARGS },
-	 { "wxEvent_Skip", _wrap_wxEvent_Skip, METH_VARARGS },
-	 { "wxEvent_SetTimestamp", _wrap_wxEvent_SetTimestamp, METH_VARARGS },
-	 { "wxEvent_SetId", _wrap_wxEvent_SetId, METH_VARARGS },
-	 { "wxEvent_SetEventType", _wrap_wxEvent_SetEventType, METH_VARARGS },
-	 { "wxEvent_SetEventObject", _wrap_wxEvent_SetEventObject, METH_VARARGS },
-	 { "wxEvent_GetTimestamp", _wrap_wxEvent_GetTimestamp, METH_VARARGS },
-	 { "wxEvent_GetSkipped", _wrap_wxEvent_GetSkipped, METH_VARARGS },
-	 { "wxEvent_GetId", _wrap_wxEvent_GetId, METH_VARARGS },
-	 { "wxEvent_GetEventType", _wrap_wxEvent_GetEventType, METH_VARARGS },
-	 { "wxEvent_GetEventObject", _wrap_wxEvent_GetEventObject, METH_VARARGS },
+	 { "wxNotifyEvent_Veto", (PyCFunction) _wrap_wxNotifyEvent_Veto, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotifyEvent_IsAllowed", (PyCFunction) _wrap_wxNotifyEvent_IsAllowed, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyEvent_GetUserData", (PyCFunction) _wrap_wxPyEvent_GetUserData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyEvent_SetUserData", (PyCFunction) _wrap_wxPyEvent_SetUserData, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPyEvent", (PyCFunction) _wrap_delete_wxPyEvent, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPyEvent", (PyCFunction) _wrap_new_wxPyEvent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_SetText", (PyCFunction) _wrap_wxUpdateUIEvent_SetText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_Enable", (PyCFunction) _wrap_wxUpdateUIEvent_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_Check", (PyCFunction) _wrap_wxUpdateUIEvent_Check, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_GetSetEnabled", (PyCFunction) _wrap_wxUpdateUIEvent_GetSetEnabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_GetSetChecked", (PyCFunction) _wrap_wxUpdateUIEvent_GetSetChecked, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_GetSetText", (PyCFunction) _wrap_wxUpdateUIEvent_GetSetText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_GetText", (PyCFunction) _wrap_wxUpdateUIEvent_GetText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_GetEnabled", (PyCFunction) _wrap_wxUpdateUIEvent_GetEnabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxUpdateUIEvent_GetChecked", (PyCFunction) _wrap_wxUpdateUIEvent_GetChecked, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIdleEvent_MoreRequested", (PyCFunction) _wrap_wxIdleEvent_MoreRequested, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIdleEvent_RequestMore", (PyCFunction) _wrap_wxIdleEvent_RequestMore, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDropFilesEvent_GetFiles", (PyCFunction) _wrap_wxDropFilesEvent_GetFiles, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDropFilesEvent_GetNumberOfFiles", (PyCFunction) _wrap_wxDropFilesEvent_GetNumberOfFiles, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDropFilesEvent_GetPosition", (PyCFunction) _wrap_wxDropFilesEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_ButtonIsDown", (PyCFunction) _wrap_wxJoystickEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_ButtonUp", (PyCFunction) _wrap_wxJoystickEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_ButtonDown", (PyCFunction) _wrap_wxJoystickEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_IsZMove", (PyCFunction) _wrap_wxJoystickEvent_IsZMove, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_IsMove", (PyCFunction) _wrap_wxJoystickEvent_IsMove, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_IsButton", (PyCFunction) _wrap_wxJoystickEvent_IsButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_SetZPosition", (PyCFunction) _wrap_wxJoystickEvent_SetZPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_SetPosition", (PyCFunction) _wrap_wxJoystickEvent_SetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_SetButtonChange", (PyCFunction) _wrap_wxJoystickEvent_SetButtonChange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_SetButtonState", (PyCFunction) _wrap_wxJoystickEvent_SetButtonState, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_SetJoystick", (PyCFunction) _wrap_wxJoystickEvent_SetJoystick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_GetJoystick", (PyCFunction) _wrap_wxJoystickEvent_GetJoystick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_GetButtonChange", (PyCFunction) _wrap_wxJoystickEvent_GetButtonChange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_GetButtonState", (PyCFunction) _wrap_wxJoystickEvent_GetButtonState, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_GetZPosition", (PyCFunction) _wrap_wxJoystickEvent_GetZPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxJoystickEvent_GetPosition", (PyCFunction) _wrap_wxJoystickEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxShowEvent_GetShow", (PyCFunction) _wrap_wxShowEvent_GetShow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxShowEvent_SetShow", (PyCFunction) _wrap_wxShowEvent_SetShow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuEvent_GetMenuId", (PyCFunction) _wrap_wxMenuEvent_GetMenuId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxActivateEvent_GetActive", (PyCFunction) _wrap_wxActivateEvent_GetActive, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEraseEvent_GetDC", (PyCFunction) _wrap_wxEraseEvent_GetDC, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMoveEvent_GetPosition", (PyCFunction) _wrap_wxMoveEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxKeyEvent_KeyCode", (PyCFunction) _wrap_wxKeyEvent_KeyCode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxKeyEvent_ShiftDown", (PyCFunction) _wrap_wxKeyEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxKeyEvent_AltDown", (PyCFunction) _wrap_wxKeyEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxKeyEvent_MetaDown", (PyCFunction) _wrap_wxKeyEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxKeyEvent_ControlDown", (PyCFunction) _wrap_wxKeyEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_GetY", (PyCFunction) _wrap_wxMouseEvent_GetY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_GetX", (PyCFunction) _wrap_wxMouseEvent_GetX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_GetLogicalPosition", (PyCFunction) _wrap_wxMouseEvent_GetLogicalPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_GetPosition", (PyCFunction) _wrap_wxMouseEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_Position", (PyCFunction) _wrap_wxMouseEvent_Position, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_Leaving", (PyCFunction) _wrap_wxMouseEvent_Leaving, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_Entering", (PyCFunction) _wrap_wxMouseEvent_Entering, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_Moving", (PyCFunction) _wrap_wxMouseEvent_Moving, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_Dragging", (PyCFunction) _wrap_wxMouseEvent_Dragging, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_RightIsDown", (PyCFunction) _wrap_wxMouseEvent_RightIsDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_MiddleIsDown", (PyCFunction) _wrap_wxMouseEvent_MiddleIsDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_LeftIsDown", (PyCFunction) _wrap_wxMouseEvent_LeftIsDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_RightDClick", (PyCFunction) _wrap_wxMouseEvent_RightDClick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_MiddleDClick", (PyCFunction) _wrap_wxMouseEvent_MiddleDClick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_LeftDClick", (PyCFunction) _wrap_wxMouseEvent_LeftDClick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_RightUp", (PyCFunction) _wrap_wxMouseEvent_RightUp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_MiddleUp", (PyCFunction) _wrap_wxMouseEvent_MiddleUp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_LeftUp", (PyCFunction) _wrap_wxMouseEvent_LeftUp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_RightDown", (PyCFunction) _wrap_wxMouseEvent_RightDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_MiddleDown", (PyCFunction) _wrap_wxMouseEvent_MiddleDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_LeftDown", (PyCFunction) _wrap_wxMouseEvent_LeftDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_ShiftDown", (PyCFunction) _wrap_wxMouseEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_AltDown", (PyCFunction) _wrap_wxMouseEvent_AltDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_MetaDown", (PyCFunction) _wrap_wxMouseEvent_MetaDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_ControlDown", (PyCFunction) _wrap_wxMouseEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_ButtonIsDown", (PyCFunction) _wrap_wxMouseEvent_ButtonIsDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_Button", (PyCFunction) _wrap_wxMouseEvent_Button, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_ButtonUp", (PyCFunction) _wrap_wxMouseEvent_ButtonUp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_ButtonDClick", (PyCFunction) _wrap_wxMouseEvent_ButtonDClick, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_ButtonDown", (PyCFunction) _wrap_wxMouseEvent_ButtonDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMouseEvent_IsButton", (PyCFunction) _wrap_wxMouseEvent_IsButton, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollEvent_GetPosition", (PyCFunction) _wrap_wxScrollEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrollEvent_GetOrientation", (PyCFunction) _wrap_wxScrollEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCommandEvent_IsSelection", (PyCFunction) _wrap_wxCommandEvent_IsSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCommandEvent_GetString", (PyCFunction) _wrap_wxCommandEvent_GetString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCommandEvent_GetSelection", (PyCFunction) _wrap_wxCommandEvent_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCommandEvent_GetInt", (PyCFunction) _wrap_wxCommandEvent_GetInt, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCommandEvent_GetExtraLong", (PyCFunction) _wrap_wxCommandEvent_GetExtraLong, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCommandEvent_Checked", (PyCFunction) _wrap_wxCommandEvent_Checked, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCloseEvent_SetCanVeto", (PyCFunction) _wrap_wxCloseEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCloseEvent_GetVeto", (PyCFunction) _wrap_wxCloseEvent_GetVeto, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCloseEvent_CanVeto", (PyCFunction) _wrap_wxCloseEvent_CanVeto, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCloseEvent_Veto", (PyCFunction) _wrap_wxCloseEvent_Veto, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCloseEvent_GetLoggingOff", (PyCFunction) _wrap_wxCloseEvent_GetLoggingOff, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCloseEvent_SetLoggingOff", (PyCFunction) _wrap_wxCloseEvent_SetLoggingOff, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSizeEvent_GetSize", (PyCFunction) _wrap_wxSizeEvent_GetSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_Skip", (PyCFunction) _wrap_wxEvent_Skip, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_SetTimestamp", (PyCFunction) _wrap_wxEvent_SetTimestamp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_SetId", (PyCFunction) _wrap_wxEvent_SetId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_SetEventType", (PyCFunction) _wrap_wxEvent_SetEventType, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_SetEventObject", (PyCFunction) _wrap_wxEvent_SetEventObject, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_GetTimestamp", (PyCFunction) _wrap_wxEvent_GetTimestamp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_GetSkipped", (PyCFunction) _wrap_wxEvent_GetSkipped, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_GetId", (PyCFunction) _wrap_wxEvent_GetId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_GetEventType", (PyCFunction) _wrap_wxEvent_GetEventType, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvent_GetEventObject", (PyCFunction) _wrap_wxEvent_GetEventObject, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp
index ab2d6cf2b9..331e047cf3 100644
--- a/utils/wxPython/src/msw/frames.cpp
+++ b/utils/wxPython/src/msw/frames.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -135,7 +135,7 @@ static void *SwigwxFrameTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _result;
     wxWindow * _arg0;
@@ -149,10 +149,11 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -202,14 +203,15 @@ static PyObject *_wrap_new_wxFrame(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))
-static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     int  _arg1 = (int ) wxBOTH;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxFrame_Centre",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxFrame_Centre",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -229,14 +231,15 @@ static PyObject *_wrap_wxFrame_Centre(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_Command(_swigobj,_swigarg0)  (_swigobj->Command(_swigarg0))
-static PyObject *_wrap_wxFrame_Command(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_Command(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFrame_Command",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFrame_Command",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -256,7 +259,7 @@ static PyObject *_wrap_wxFrame_Command(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_CreateStatusBar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->CreateStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxFrame * _arg0;
@@ -265,10 +268,11 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
     wxWindowID  _arg3 = (wxWindowID ) -1;
     char * _arg4 = (char *) "statusBar";
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","number","style","id","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|ilis:wxFrame_CreateStatusBar",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ilis:wxFrame_CreateStatusBar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -293,7 +297,7 @@ static PyObject *_wrap_wxFrame_CreateStatusBar(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_CreateToolBar(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->CreateToolBar(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _result;
     wxFrame * _arg0;
@@ -301,10 +305,11 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
     wxWindowID  _arg2 = (wxWindowID ) -1;
     char * _arg3 = (char *) "toolBar";
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","style","id","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|lis:wxFrame_CreateToolBar",&_argo0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|lis:wxFrame_CreateToolBar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -329,15 +334,16 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_GetMenuBar(_swigobj)  (_swigobj->GetMenuBar())
-static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _result;
     wxFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFrame_GetMenuBar",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_GetMenuBar",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -362,15 +368,16 @@ static PyObject *_wrap_wxFrame_GetMenuBar(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_GetStatusBar(_swigobj)  (_swigobj->GetStatusBar())
-static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFrame_GetStatusBar",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_GetStatusBar",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -395,14 +402,15 @@ static PyObject *_wrap_wxFrame_GetStatusBar(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_GetTitle(_swigobj)  (_swigobj->GetTitle())
-static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFrame_GetTitle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_GetTitle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -426,15 +434,16 @@ static PyObject *_wrap_wxFrame_GetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_GetToolBar(_swigobj)  (_swigobj->GetToolBar())
-static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _result;
     wxFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFrame_GetToolBar",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_GetToolBar",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -459,15 +468,16 @@ static PyObject *_wrap_wxFrame_GetToolBar(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_Iconize(_swigobj,_swigarg0)  (_swigobj->Iconize(_swigarg0))
-static PyObject *_wrap_wxFrame_Iconize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_Iconize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","iconize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFrame_Iconize",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFrame_Iconize",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -488,14 +498,15 @@ static PyObject *_wrap_wxFrame_Iconize(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_IsIconized(_swigobj)  (_swigobj->IsIconized())
-static PyObject *_wrap_wxFrame_IsIconized(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_IsIconized(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxFrame_IsIconized",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxFrame_IsIconized",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -514,15 +525,16 @@ static PyObject *_wrap_wxFrame_IsIconized(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_Maximize(_swigobj,_swigarg0)  (_swigobj->Maximize(_swigarg0))
-static PyObject *_wrap_wxFrame_Maximize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_Maximize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","maximize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxFrame_Maximize",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxFrame_Maximize",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -543,15 +555,16 @@ static PyObject *_wrap_wxFrame_Maximize(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_SetAcceleratorTable(_swigobj,_swigarg0)  (_swigobj->SetAcceleratorTable(_swigarg0))
-static PyObject *_wrap_wxFrame_SetAcceleratorTable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxAcceleratorTable * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","accel", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetAcceleratorTable",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetAcceleratorTable",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -578,15 +591,16 @@ static PyObject *_wrap_wxFrame_SetAcceleratorTable(PyObject *self, PyObject *arg
 }
 
 #define wxFrame_SetIcon(_swigobj,_swigarg0)  (_swigobj->SetIcon(_swigarg0))
-static PyObject *_wrap_wxFrame_SetIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxIcon * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","icon", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetIcon",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetIcon",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -613,15 +627,16 @@ static PyObject *_wrap_wxFrame_SetIcon(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_SetMenuBar(_swigobj,_swigarg0)  (_swigobj->SetMenuBar(_swigarg0))
-static PyObject *_wrap_wxFrame_SetMenuBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxMenuBar * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","menuBar", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetMenuBar",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetMenuBar",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -648,15 +663,16 @@ static PyObject *_wrap_wxFrame_SetMenuBar(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_SetStatusBar(_swigobj,_swigarg0)  (_swigobj->SetStatusBar(_swigarg0))
-static PyObject *_wrap_wxFrame_SetStatusBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxStatusBar * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","statusBar", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetStatusBar",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetStatusBar",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -683,16 +699,17 @@ static PyObject *_wrap_wxFrame_SetStatusBar(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_SetStatusText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxFrame_SetStatusText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxString * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text","number", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxFrame_SetStatusText",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxFrame_SetStatusText",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -723,16 +740,17 @@ static PyObject *_wrap_wxFrame_SetStatusText(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_SetStatusWidths(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusWidths(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     int  _arg1;
     int * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","LIST", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetStatusWidths",&_argo0,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetStatusWidths",_kwnames,&_argo0,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -770,15 +788,16 @@ static PyObject *_wrap_wxFrame_SetStatusWidths(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
-static PyObject *_wrap_wxFrame_SetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","title", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetTitle",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetTitle",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -809,15 +828,16 @@ static PyObject *_wrap_wxFrame_SetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxFrame_SetToolBar(_swigobj,_swigarg0)  (_swigobj->SetToolBar(_swigarg0))
-static PyObject *_wrap_wxFrame_SetToolBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFrame_SetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _arg0;
     wxToolBar * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","toolbar", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxFrame_SetToolBar",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxFrame_SetToolBar",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -868,7 +888,7 @@ static void *SwigwxMiniFrameTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMiniFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMiniFrame * _result;
     wxWindow * _arg0;
@@ -882,10 +902,11 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxMiniFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMiniFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -935,27 +956,27 @@ static PyObject *_wrap_new_wxMiniFrame(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef framescMethods[] = {
-	 { "new_wxMiniFrame", _wrap_new_wxMiniFrame, METH_VARARGS },
-	 { "wxFrame_SetToolBar", _wrap_wxFrame_SetToolBar, METH_VARARGS },
-	 { "wxFrame_SetTitle", _wrap_wxFrame_SetTitle, METH_VARARGS },
-	 { "wxFrame_SetStatusWidths", _wrap_wxFrame_SetStatusWidths, METH_VARARGS },
-	 { "wxFrame_SetStatusText", _wrap_wxFrame_SetStatusText, METH_VARARGS },
-	 { "wxFrame_SetStatusBar", _wrap_wxFrame_SetStatusBar, METH_VARARGS },
-	 { "wxFrame_SetMenuBar", _wrap_wxFrame_SetMenuBar, METH_VARARGS },
-	 { "wxFrame_SetIcon", _wrap_wxFrame_SetIcon, METH_VARARGS },
-	 { "wxFrame_SetAcceleratorTable", _wrap_wxFrame_SetAcceleratorTable, METH_VARARGS },
-	 { "wxFrame_Maximize", _wrap_wxFrame_Maximize, METH_VARARGS },
-	 { "wxFrame_IsIconized", _wrap_wxFrame_IsIconized, METH_VARARGS },
-	 { "wxFrame_Iconize", _wrap_wxFrame_Iconize, METH_VARARGS },
-	 { "wxFrame_GetToolBar", _wrap_wxFrame_GetToolBar, METH_VARARGS },
-	 { "wxFrame_GetTitle", _wrap_wxFrame_GetTitle, METH_VARARGS },
-	 { "wxFrame_GetStatusBar", _wrap_wxFrame_GetStatusBar, METH_VARARGS },
-	 { "wxFrame_GetMenuBar", _wrap_wxFrame_GetMenuBar, METH_VARARGS },
-	 { "wxFrame_CreateToolBar", _wrap_wxFrame_CreateToolBar, METH_VARARGS },
-	 { "wxFrame_CreateStatusBar", _wrap_wxFrame_CreateStatusBar, METH_VARARGS },
-	 { "wxFrame_Command", _wrap_wxFrame_Command, METH_VARARGS },
-	 { "wxFrame_Centre", _wrap_wxFrame_Centre, METH_VARARGS },
-	 { "new_wxFrame", _wrap_new_wxFrame, METH_VARARGS },
+	 { "new_wxMiniFrame", (PyCFunction) _wrap_new_wxMiniFrame, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetToolBar", (PyCFunction) _wrap_wxFrame_SetToolBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetTitle", (PyCFunction) _wrap_wxFrame_SetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetStatusWidths", (PyCFunction) _wrap_wxFrame_SetStatusWidths, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetStatusText", (PyCFunction) _wrap_wxFrame_SetStatusText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetStatusBar", (PyCFunction) _wrap_wxFrame_SetStatusBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetMenuBar", (PyCFunction) _wrap_wxFrame_SetMenuBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetIcon", (PyCFunction) _wrap_wxFrame_SetIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_SetAcceleratorTable", (PyCFunction) _wrap_wxFrame_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_Maximize", (PyCFunction) _wrap_wxFrame_Maximize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_IsIconized", (PyCFunction) _wrap_wxFrame_IsIconized, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_Iconize", (PyCFunction) _wrap_wxFrame_Iconize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_GetToolBar", (PyCFunction) _wrap_wxFrame_GetToolBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_GetTitle", (PyCFunction) _wrap_wxFrame_GetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_GetStatusBar", (PyCFunction) _wrap_wxFrame_GetStatusBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_GetMenuBar", (PyCFunction) _wrap_wxFrame_GetMenuBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_CreateToolBar", (PyCFunction) _wrap_wxFrame_CreateToolBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_CreateStatusBar", (PyCFunction) _wrap_wxFrame_CreateStatusBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_Command", (PyCFunction) _wrap_wxFrame_Command, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFrame_Centre", (PyCFunction) _wrap_wxFrame_Centre, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxFrame", (PyCFunction) _wrap_new_wxFrame, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp
index df658b8553..d7eca5c383 100644
--- a/utils/wxPython/src/msw/gdi.cpp
+++ b/utils/wxPython/src/msw/gdi.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 802)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -3424,7 +3424,7 @@ static PyObject *_wrap_wxDC_BeginDrawing(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-#define wxDC_Blit(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7)  (_swigobj->Blit(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7))
+#define wxDC_Blit(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8)  (_swigobj->Blit(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8))
 static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     bool  _result;
@@ -3436,12 +3436,13 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
     wxDC * _arg5;
     long  _arg6;
     long  _arg7;
-    long  _arg8;
+    int  _arg8 = (int ) wxCOPY;
+    int  _arg9 = (int ) FALSE;
     PyObject * _argo0 = 0;
     PyObject * _argo5 = 0;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OllllOlll:wxDC_Blit",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8)) 
+    if(!PyArg_ParseTuple(args,"OllllOll|ii:wxDC_Blit",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_argo5,&_arg6,&_arg7,&_arg8,&_arg9)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3459,7 +3460,7 @@ static PyObject *_wrap_wxDC_Blit(PyObject *self, PyObject *args) {
     }
 {
     wxPy_BEGIN_ALLOW_THREADS;
-        _result = (bool )wxDC_Blit(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8);
+        _result = (bool )wxDC_Blit(_arg0,_arg1,_arg2,_arg3,_arg4,_arg5,_arg6,_arg7,_arg8,_arg9);
 
     wxPy_END_ALLOW_THREADS;
 }    _resultobj = Py_BuildValue("i",_result);
@@ -5640,31 +5641,19 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void  wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long  x,long  y,bool  swapPalette) {
-            wxMemoryDC* memDC = new wxMemoryDC;
-            memDC->SelectObject(bitmap);
-#ifdef __WXMSW__
-            if (swapPalette)
-                self->SetPalette(*bitmap.GetPalette());
-#endif
-            self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
-                    0, 0, self->GetLogicalFunction());
-            memDC->SelectObject(wxNullBitmap);
-            delete memDC;
-        }
+#define wxDC_DrawBitmap(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->DrawBitmap(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
 static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
     PyObject * _resultobj;
     wxDC * _arg0;
     wxBitmap * _arg1;
     long  _arg2;
     long  _arg3;
-    bool  _arg4 = (bool ) TRUE;
+    int  _arg4 = (int ) FALSE;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
-    int tempbool4 = (int) TRUE;
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOll|i:wxDC_DrawBitmap",&_argo0,&_argo1,&_arg2,&_arg3,&tempbool4)) 
+    if(!PyArg_ParseTuple(args,"OOll|i:wxDC_DrawBitmap",&_argo0,&_argo1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5680,7 +5669,6 @@ static PyObject *_wrap_wxDC_DrawBitmap(PyObject *self, PyObject *args) {
         return NULL;
         }
     }
-    _arg4 = (bool ) tempbool4;
 {
     wxPy_BEGIN_ALLOW_THREADS;
         wxDC_DrawBitmap(_arg0,*_arg1,_arg2,_arg3,_arg4);
diff --git a/utils/wxPython/src/msw/image.cpp b/utils/wxPython/src/msw/image.cpp
index cf5d867ca0..fd3eeb330b 100644
--- a/utils/wxPython/src/msw/image.cpp
+++ b/utils/wxPython/src/msw/image.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -138,13 +138,14 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_wxNullImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNullImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxNullImage")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxNullImage",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -161,15 +162,16 @@ static PyObject *_wrap_wxNullImage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxEmptyImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEmptyImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _result;
     int  _arg0;
     int  _arg1;
+    char *_kwnames[] = { "width","height", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ii:wxEmptyImage",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ii:wxEmptyImage",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -186,17 +188,18 @@ static PyObject *_wrap_wxEmptyImage(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxImageFromMime(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageFromMime(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _result;
     wxString * _arg0;
     wxString * _arg1;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "name","mimetype", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxImageFromMime",&_obj0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxImageFromMime",_kwnames,&_obj0,&_obj1)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -235,15 +238,16 @@ static PyObject *_wrap_wxImageFromMime(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxImageFromBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageFromBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _result;
     wxBitmap * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "bitmap", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImageFromBitmap",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImageFromBitmap",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -267,13 +271,14 @@ static PyObject *_wrap_wxImageFromBitmap(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxImage_AddHandler(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_AddHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "handler", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_AddHandler",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_AddHandler",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -293,13 +298,14 @@ static PyObject *_wrap_wxImage_AddHandler(PyObject *self, PyObject *args) {
 }
 
 #define new_wxImageHandler() (new wxImageHandler())
-static PyObject *_wrap_new_wxImageHandler(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxImageHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageHandler * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxImageHandler")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxImageHandler",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -317,14 +323,15 @@ static PyObject *_wrap_new_wxImageHandler(PyObject *self, PyObject *args) {
 }
 
 #define wxImageHandler_GetName(_swigobj)  (_swigobj->GetName())
-static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImageHandler_GetName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -348,14 +355,15 @@ static PyObject *_wrap_wxImageHandler_GetName(PyObject *self, PyObject *args) {
 }
 
 #define wxImageHandler_GetExtension(_swigobj)  (_swigobj->GetExtension())
-static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetExtension",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImageHandler_GetExtension",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -379,14 +387,15 @@ static PyObject *_wrap_wxImageHandler_GetExtension(PyObject *self, PyObject *arg
 }
 
 #define wxImageHandler_GetType(_swigobj)  (_swigobj->GetType())
-static PyObject *_wrap_wxImageHandler_GetType(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_GetType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxImageHandler * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetType",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImageHandler_GetType",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -405,14 +414,15 @@ static PyObject *_wrap_wxImageHandler_GetType(PyObject *self, PyObject *args) {
 }
 
 #define wxImageHandler_GetMimeType(_swigobj)  (_swigobj->GetMimeType())
-static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxImageHandler * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImageHandler_GetMimeType",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImageHandler_GetMimeType",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -436,15 +446,16 @@ static PyObject *_wrap_wxImageHandler_GetMimeType(PyObject *self, PyObject *args
 }
 
 #define wxImageHandler_SetName(_swigobj,_swigarg0)  (_swigobj->SetName(_swigarg0))
-static PyObject *_wrap_wxImageHandler_SetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxImageHandler_SetName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxImageHandler_SetName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -475,15 +486,16 @@ static PyObject *_wrap_wxImageHandler_SetName(PyObject *self, PyObject *args) {
 }
 
 #define wxImageHandler_SetExtension(_swigobj,_swigarg0)  (_swigobj->SetExtension(_swigarg0))
-static PyObject *_wrap_wxImageHandler_SetExtension(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_SetExtension(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","extension", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxImageHandler_SetExtension",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxImageHandler_SetExtension",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -514,14 +526,15 @@ static PyObject *_wrap_wxImageHandler_SetExtension(PyObject *self, PyObject *arg
 }
 
 #define wxImageHandler_SetType(_swigobj,_swigarg0)  (_swigobj->SetType(_swigarg0))
-static PyObject *_wrap_wxImageHandler_SetType(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_SetType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","type", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxImageHandler_SetType",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxImageHandler_SetType",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -541,15 +554,16 @@ static PyObject *_wrap_wxImageHandler_SetType(PyObject *self, PyObject *args) {
 }
 
 #define wxImageHandler_SetMimeType(_swigobj,_swigarg0)  (_swigobj->SetMimeType(_swigarg0))
-static PyObject *_wrap_wxImageHandler_SetMimeType(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImageHandler_SetMimeType(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageHandler * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","mimetype", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxImageHandler_SetMimeType",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxImageHandler_SetMimeType",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -588,13 +602,14 @@ static void *SwigwxPNGHandlerTowxImageHandler(void *ptr) {
 }
 
 #define new_wxPNGHandler() (new wxPNGHandler())
-static PyObject *_wrap_new_wxPNGHandler(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPNGHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPNGHandler * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxPNGHandler")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPNGHandler",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -620,13 +635,14 @@ static void *SwigwxJPEGHandlerTowxImageHandler(void *ptr) {
 }
 
 #define new_wxJPEGHandler() (new wxJPEGHandler())
-static PyObject *_wrap_new_wxJPEGHandler(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxJPEGHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxJPEGHandler * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxJPEGHandler")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxJPEGHandler",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -652,13 +668,14 @@ static void *SwigwxBMPHandlerTowxImageHandler(void *ptr) {
 }
 
 #define new_wxBMPHandler() (new wxBMPHandler())
-static PyObject *_wrap_new_wxBMPHandler(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxBMPHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBMPHandler * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxBMPHandler")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxBMPHandler",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -684,13 +701,14 @@ static void *SwigwxGIFHandlerTowxImageHandler(void *ptr) {
 }
 
 #define new_wxGIFHandler() (new wxGIFHandler())
-static PyObject *_wrap_new_wxGIFHandler(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxGIFHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGIFHandler * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxGIFHandler")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGIFHandler",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -708,16 +726,17 @@ static PyObject *_wrap_new_wxGIFHandler(PyObject *self, PyObject *args) {
 }
 
 #define new_wxImage(_swigarg0,_swigarg1) (new wxImage(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _result;
     wxString * _arg0;
     long  _arg1 = (long ) wxBITMAP_TYPE_PNG;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "name","type", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|l:new_wxImage",&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|l:new_wxImage",_kwnames,&_obj0,&_arg1)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -746,13 +765,14 @@ static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxImage(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxImage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxImage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -772,15 +792,16 @@ static PyObject *_wrap_delete_wxImage(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_ConvertToBitmap(_swigobj)  (_swigobj->ConvertToBitmap())
-static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_ConvertToBitmap",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_ConvertToBitmap",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -800,15 +821,16 @@ static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_Create(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Create(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_Create(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_Create(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxImage_Create",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxImage_Create",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -828,13 +850,14 @@ static PyObject *_wrap_wxImage_Create(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_Destroy(_swigobj)  (_swigobj->Destroy())
-static PyObject *_wrap_wxImage_Destroy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_Destroy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_Destroy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -854,17 +877,18 @@ static PyObject *_wrap_wxImage_Destroy(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_Scale(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Scale(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_Scale(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_Scale(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _result;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width","height", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxImage_Scale",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxImage_Scale",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -884,15 +908,16 @@ static PyObject *_wrap_wxImage_Scale(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_Rescale(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Rescale(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_Rescale(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_Rescale(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxImage_Rescale",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxImage_Rescale",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -912,7 +937,7 @@ static PyObject *_wrap_wxImage_Rescale(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_SetRGB(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetRGB(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxImage_SetRGB(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_SetRGB(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     int  _arg1;
@@ -921,9 +946,10 @@ static PyObject *_wrap_wxImage_SetRGB(PyObject *self, PyObject *args) {
     unsigned char  _arg4;
     unsigned char  _arg5;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","r","g","b", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiibbb:wxImage_SetRGB",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiibbb:wxImage_SetRGB",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -943,16 +969,17 @@ static PyObject *_wrap_wxImage_SetRGB(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetRed(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetRed(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_GetRed(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetRed(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxImage_GetRed",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxImage_GetRed",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -971,16 +998,17 @@ static PyObject *_wrap_wxImage_GetRed(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetGreen(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetGreen(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_GetGreen(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetGreen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxImage_GetGreen",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxImage_GetGreen",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -999,16 +1027,17 @@ static PyObject *_wrap_wxImage_GetGreen(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetBlue(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetBlue(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_GetBlue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetBlue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxImage_GetBlue",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxImage_GetBlue",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1027,7 +1056,7 @@ static PyObject *_wrap_wxImage_GetBlue(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_LoadFile(_swigobj,_swigarg0,_swigarg1)  (_swigobj->LoadFile(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_LoadFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_LoadFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
@@ -1035,9 +1064,10 @@ static PyObject *_wrap_wxImage_LoadFile(PyObject *self, PyObject *args) {
     long  _arg2 = (long ) wxBITMAP_TYPE_PNG;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name","type", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|l:wxImage_LoadFile",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|l:wxImage_LoadFile",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1067,7 +1097,7 @@ static PyObject *_wrap_wxImage_LoadFile(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_LoadMimeFile(_swigobj,_swigarg0,_swigarg1)  (_swigobj->LoadFile(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
@@ -1076,9 +1106,10 @@ static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","name","mimetype", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxImage_LoadMimeFile",&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxImage_LoadMimeFile",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1119,7 +1150,7 @@ static PyObject *_wrap_wxImage_LoadMimeFile(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_SaveFile(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SaveFile(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_SaveFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_SaveFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
@@ -1127,9 +1158,10 @@ static PyObject *_wrap_wxImage_SaveFile(PyObject *self, PyObject *args) {
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name","type", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOi:wxImage_SaveFile",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxImage_SaveFile",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1159,7 +1191,7 @@ static PyObject *_wrap_wxImage_SaveFile(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_SaveMimeFile(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SaveFile(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
@@ -1168,9 +1200,10 @@ static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","name","mimetype", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxImage_SaveMimeFile",&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxImage_SaveMimeFile",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1211,14 +1244,15 @@ static PyObject *_wrap_wxImage_SaveMimeFile(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_Ok(_swigobj)  (_swigobj->Ok())
-static PyObject *_wrap_wxImage_Ok(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_Ok",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_Ok",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1237,14 +1271,15 @@ static PyObject *_wrap_wxImage_Ok(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetWidth(_swigobj)  (_swigobj->GetWidth())
-static PyObject *_wrap_wxImage_GetWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_GetWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_GetWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1263,14 +1298,15 @@ static PyObject *_wrap_wxImage_GetWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetHeight(_swigobj)  (_swigobj->GetHeight())
-static PyObject *_wrap_wxImage_GetHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_GetHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_GetHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1293,14 +1329,15 @@ static PyObject * wxImage_GetData(wxImage *self) {
             int len = self->GetWidth() * self->GetHeight() * 3;
             return PyString_FromStringAndSize((char*)data, len);
         }
-static PyObject *_wrap_wxImage_GetData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_GetData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_GetData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1330,15 +1367,16 @@ static void  wxImage_SetData(wxImage *self,PyObject * data) {
             dataPtr = (unsigned char*)PyString_AsString(data);
             self->SetData(dataPtr);
         }
-static PyObject *_wrap_wxImage_SetData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_SetData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     PyObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","data", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxImage_SetData",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxImage_SetData",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1361,16 +1399,17 @@ static PyObject *_wrap_wxImage_SetData(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_SetMaskColour(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetMaskColour(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxImage_SetMaskColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_SetMaskColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     unsigned char  _arg1;
     unsigned char  _arg2;
     unsigned char  _arg3;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","r","g","b", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Obbb:wxImage_SetMaskColour",&_argo0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Obbb:wxImage_SetMaskColour",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1390,14 +1429,15 @@ static PyObject *_wrap_wxImage_SetMaskColour(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetMaskRed(_swigobj)  (_swigobj->GetMaskRed())
-static PyObject *_wrap_wxImage_GetMaskRed(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetMaskRed(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_GetMaskRed",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_GetMaskRed",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1416,14 +1456,15 @@ static PyObject *_wrap_wxImage_GetMaskRed(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetMaskGreen(_swigobj)  (_swigobj->GetMaskGreen())
-static PyObject *_wrap_wxImage_GetMaskGreen(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetMaskGreen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_GetMaskGreen",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_GetMaskGreen",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1442,14 +1483,15 @@ static PyObject *_wrap_wxImage_GetMaskGreen(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_GetMaskBlue(_swigobj)  (_swigobj->GetMaskBlue())
-static PyObject *_wrap_wxImage_GetMaskBlue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_GetMaskBlue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     unsigned char  _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_GetMaskBlue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_GetMaskBlue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1468,15 +1510,16 @@ static PyObject *_wrap_wxImage_GetMaskBlue(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_SetMask(_swigobj,_swigarg0)  (_swigobj->SetMask(_swigarg0))
-static PyObject *_wrap_wxImage_SetMask(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_SetMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImage * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","mask", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxImage_SetMask",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxImage_SetMask",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1497,14 +1540,15 @@ static PyObject *_wrap_wxImage_SetMask(PyObject *self, PyObject *args) {
 }
 
 #define wxImage_HasMask(_swigobj)  (_swigobj->HasMask())
-static PyObject *_wrap_wxImage_HasMask(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxImage_HasMask(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxImage * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxImage_HasMask",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_HasMask",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1523,50 +1567,50 @@ static PyObject *_wrap_wxImage_HasMask(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef imagecMethods[] = {
-	 { "wxImage_HasMask", _wrap_wxImage_HasMask, METH_VARARGS },
-	 { "wxImage_SetMask", _wrap_wxImage_SetMask, METH_VARARGS },
-	 { "wxImage_GetMaskBlue", _wrap_wxImage_GetMaskBlue, METH_VARARGS },
-	 { "wxImage_GetMaskGreen", _wrap_wxImage_GetMaskGreen, METH_VARARGS },
-	 { "wxImage_GetMaskRed", _wrap_wxImage_GetMaskRed, METH_VARARGS },
-	 { "wxImage_SetMaskColour", _wrap_wxImage_SetMaskColour, METH_VARARGS },
-	 { "wxImage_SetData", _wrap_wxImage_SetData, METH_VARARGS },
-	 { "wxImage_GetData", _wrap_wxImage_GetData, METH_VARARGS },
-	 { "wxImage_GetHeight", _wrap_wxImage_GetHeight, METH_VARARGS },
-	 { "wxImage_GetWidth", _wrap_wxImage_GetWidth, METH_VARARGS },
-	 { "wxImage_Ok", _wrap_wxImage_Ok, METH_VARARGS },
-	 { "wxImage_SaveMimeFile", _wrap_wxImage_SaveMimeFile, METH_VARARGS },
-	 { "wxImage_SaveFile", _wrap_wxImage_SaveFile, METH_VARARGS },
-	 { "wxImage_LoadMimeFile", _wrap_wxImage_LoadMimeFile, METH_VARARGS },
-	 { "wxImage_LoadFile", _wrap_wxImage_LoadFile, METH_VARARGS },
-	 { "wxImage_GetBlue", _wrap_wxImage_GetBlue, METH_VARARGS },
-	 { "wxImage_GetGreen", _wrap_wxImage_GetGreen, METH_VARARGS },
-	 { "wxImage_GetRed", _wrap_wxImage_GetRed, METH_VARARGS },
-	 { "wxImage_SetRGB", _wrap_wxImage_SetRGB, METH_VARARGS },
-	 { "wxImage_Rescale", _wrap_wxImage_Rescale, METH_VARARGS },
-	 { "wxImage_Scale", _wrap_wxImage_Scale, METH_VARARGS },
-	 { "wxImage_Destroy", _wrap_wxImage_Destroy, METH_VARARGS },
-	 { "wxImage_Create", _wrap_wxImage_Create, METH_VARARGS },
-	 { "wxImage_ConvertToBitmap", _wrap_wxImage_ConvertToBitmap, METH_VARARGS },
-	 { "delete_wxImage", _wrap_delete_wxImage, METH_VARARGS },
-	 { "new_wxImage", _wrap_new_wxImage, METH_VARARGS },
-	 { "new_wxGIFHandler", _wrap_new_wxGIFHandler, METH_VARARGS },
-	 { "new_wxBMPHandler", _wrap_new_wxBMPHandler, METH_VARARGS },
-	 { "new_wxJPEGHandler", _wrap_new_wxJPEGHandler, METH_VARARGS },
-	 { "new_wxPNGHandler", _wrap_new_wxPNGHandler, METH_VARARGS },
-	 { "wxImageHandler_SetMimeType", _wrap_wxImageHandler_SetMimeType, METH_VARARGS },
-	 { "wxImageHandler_SetType", _wrap_wxImageHandler_SetType, METH_VARARGS },
-	 { "wxImageHandler_SetExtension", _wrap_wxImageHandler_SetExtension, METH_VARARGS },
-	 { "wxImageHandler_SetName", _wrap_wxImageHandler_SetName, METH_VARARGS },
-	 { "wxImageHandler_GetMimeType", _wrap_wxImageHandler_GetMimeType, METH_VARARGS },
-	 { "wxImageHandler_GetType", _wrap_wxImageHandler_GetType, METH_VARARGS },
-	 { "wxImageHandler_GetExtension", _wrap_wxImageHandler_GetExtension, METH_VARARGS },
-	 { "wxImageHandler_GetName", _wrap_wxImageHandler_GetName, METH_VARARGS },
-	 { "new_wxImageHandler", _wrap_new_wxImageHandler, METH_VARARGS },
-	 { "wxImage_AddHandler", _wrap_wxImage_AddHandler, METH_VARARGS },
-	 { "wxImageFromBitmap", _wrap_wxImageFromBitmap, METH_VARARGS },
-	 { "wxImageFromMime", _wrap_wxImageFromMime, METH_VARARGS },
-	 { "wxEmptyImage", _wrap_wxEmptyImage, METH_VARARGS },
-	 { "wxNullImage", _wrap_wxNullImage, METH_VARARGS },
+	 { "wxImage_HasMask", (PyCFunction) _wrap_wxImage_HasMask, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_SetMask", (PyCFunction) _wrap_wxImage_SetMask, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetMaskBlue", (PyCFunction) _wrap_wxImage_GetMaskBlue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetMaskGreen", (PyCFunction) _wrap_wxImage_GetMaskGreen, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetMaskRed", (PyCFunction) _wrap_wxImage_GetMaskRed, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_SetMaskColour", (PyCFunction) _wrap_wxImage_SetMaskColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_SetData", (PyCFunction) _wrap_wxImage_SetData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetData", (PyCFunction) _wrap_wxImage_GetData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetHeight", (PyCFunction) _wrap_wxImage_GetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetWidth", (PyCFunction) _wrap_wxImage_GetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_Ok", (PyCFunction) _wrap_wxImage_Ok, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_SaveMimeFile", (PyCFunction) _wrap_wxImage_SaveMimeFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_SaveFile", (PyCFunction) _wrap_wxImage_SaveFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_LoadMimeFile", (PyCFunction) _wrap_wxImage_LoadMimeFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_LoadFile", (PyCFunction) _wrap_wxImage_LoadFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetBlue", (PyCFunction) _wrap_wxImage_GetBlue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetGreen", (PyCFunction) _wrap_wxImage_GetGreen, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_GetRed", (PyCFunction) _wrap_wxImage_GetRed, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_SetRGB", (PyCFunction) _wrap_wxImage_SetRGB, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_Rescale", (PyCFunction) _wrap_wxImage_Rescale, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_Scale", (PyCFunction) _wrap_wxImage_Scale, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_Destroy", (PyCFunction) _wrap_wxImage_Destroy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_Create", (PyCFunction) _wrap_wxImage_Create, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxImage", (PyCFunction) _wrap_delete_wxImage, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxImage", (PyCFunction) _wrap_new_wxImage, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxGIFHandler", (PyCFunction) _wrap_new_wxGIFHandler, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxBMPHandler", (PyCFunction) _wrap_new_wxBMPHandler, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxJPEGHandler", (PyCFunction) _wrap_new_wxJPEGHandler, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPNGHandler", (PyCFunction) _wrap_new_wxPNGHandler, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_SetMimeType", (PyCFunction) _wrap_wxImageHandler_SetMimeType, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_SetType", (PyCFunction) _wrap_wxImageHandler_SetType, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_SetExtension", (PyCFunction) _wrap_wxImageHandler_SetExtension, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_SetName", (PyCFunction) _wrap_wxImageHandler_SetName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_GetMimeType", (PyCFunction) _wrap_wxImageHandler_GetMimeType, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_GetType", (PyCFunction) _wrap_wxImageHandler_GetType, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_GetExtension", (PyCFunction) _wrap_wxImageHandler_GetExtension, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageHandler_GetName", (PyCFunction) _wrap_wxImageHandler_GetName, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxImageHandler", (PyCFunction) _wrap_new_wxImageHandler, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImage_AddHandler", (PyCFunction) _wrap_wxImage_AddHandler, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageFromBitmap", (PyCFunction) _wrap_wxImageFromBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxImageFromMime", (PyCFunction) _wrap_wxImageFromMime, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEmptyImage", (PyCFunction) _wrap_wxEmptyImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNullImage", (PyCFunction) _wrap_wxNullImage, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp
index aab8bf8657..c199bb36ce 100644
--- a/utils/wxPython/src/msw/mdi.cpp
+++ b/utils/wxPython/src/msw/mdi.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -142,7 +142,7 @@ static void *SwigwxMDIParentFrameTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMDIParentFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMDIParentFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIParentFrame * _result;
     wxWindow * _arg0;
@@ -156,10 +156,11 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxMDIParentFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMDIParentFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -209,13 +210,14 @@ static PyObject *_wrap_new_wxMDIParentFrame(PyObject *self, PyObject *args) {
 }
 
 #define wxMDIParentFrame_ActivateNext(_swigobj)  (_swigobj->ActivateNext())
-static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_ActivateNext",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_ActivateNext",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -235,13 +237,14 @@ static PyObject *_wrap_wxMDIParentFrame_ActivateNext(PyObject *self, PyObject *a
 }
 
 #define wxMDIParentFrame_ActivatePrevious(_swigobj)  (_swigobj->ActivatePrevious())
-static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_ActivatePrevious",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_ActivatePrevious",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -261,13 +264,14 @@ static PyObject *_wrap_wxMDIParentFrame_ActivatePrevious(PyObject *self, PyObjec
 }
 
 #define wxMDIParentFrame_ArrangeIcons(_swigobj)  (_swigobj->ArrangeIcons())
-static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_ArrangeIcons",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_ArrangeIcons",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -287,13 +291,14 @@ static PyObject *_wrap_wxMDIParentFrame_ArrangeIcons(PyObject *self, PyObject *a
 }
 
 #define wxMDIParentFrame_Cascade(_swigobj)  (_swigobj->Cascade())
-static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_Cascade",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_Cascade",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -313,15 +318,16 @@ static PyObject *_wrap_wxMDIParentFrame_Cascade(PyObject *self, PyObject *args)
 }
 
 #define wxMDIParentFrame_GetActiveChild(_swigobj)  (_swigobj->GetActiveChild())
-static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIChildFrame * _result;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_GetActiveChild",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_GetActiveChild",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -346,15 +352,16 @@ static PyObject *_wrap_wxMDIParentFrame_GetActiveChild(PyObject *self, PyObject
 }
 
 #define wxMDIParentFrame_GetClientWindow(_swigobj)  (_swigobj->GetClientWindow())
-static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIClientWindow * _result;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_GetClientWindow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_GetClientWindow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -379,15 +386,16 @@ static PyObject *_wrap_wxMDIParentFrame_GetClientWindow(PyObject *self, PyObject
 }
 
 #define wxMDIParentFrame_GetToolBar(_swigobj)  (_swigobj->GetToolBar())
-static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_GetToolBar",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_GetToolBar",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -412,15 +420,16 @@ static PyObject *_wrap_wxMDIParentFrame_GetToolBar(PyObject *self, PyObject *arg
 }
 
 #define wxMDIParentFrame_SetToolBar(_swigobj,_swigarg0)  (_swigobj->SetToolBar(_swigarg0))
-static PyObject *_wrap_wxMDIParentFrame_SetToolBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_SetToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     wxToolBar * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","toolbar", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMDIParentFrame_SetToolBar",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMDIParentFrame_SetToolBar",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -447,13 +456,14 @@ static PyObject *_wrap_wxMDIParentFrame_SetToolBar(PyObject *self, PyObject *arg
 }
 
 #define wxMDIParentFrame_Tile(_swigobj)  (_swigobj->Tile())
-static PyObject *_wrap_wxMDIParentFrame_Tile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIParentFrame_Tile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIParentFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIParentFrame_Tile",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIParentFrame_Tile",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -497,7 +507,7 @@ static void *SwigwxMDIChildFrameTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMDIChildFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxMDIChildFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIChildFrame * _result;
     wxMDIParentFrame * _arg0;
@@ -511,10 +521,11 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxMDIChildFrame",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxMDIChildFrame",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -564,13 +575,14 @@ static PyObject *_wrap_new_wxMDIChildFrame(PyObject *self, PyObject *args) {
 }
 
 #define wxMDIChildFrame_Activate(_swigobj)  (_swigobj->Activate())
-static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIChildFrame_Activate",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIChildFrame_Activate",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -590,15 +602,16 @@ static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args)
 }
 
 #define wxMDIChildFrame_Maximize(_swigobj,_swigarg0)  (_swigobj->Maximize(_swigarg0))
-static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","maximize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMDIChildFrame_Maximize",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMDIChildFrame_Maximize",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -619,13 +632,14 @@ static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args)
 }
 
 #define wxMDIChildFrame_Restore(_swigobj)  (_swigobj->Restore())
-static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMDIChildFrame_Restore(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIChildFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMDIChildFrame_Restore",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMDIChildFrame_Restore",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -661,16 +675,17 @@ static void *SwigwxMDIClientWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMDIClientWindow(_swigarg0,_swigarg1) (new wxMDIClientWindow(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMDIClientWindow * _result;
     wxMDIParentFrame * _arg0;
     long  _arg1 = (long ) 0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "parent","style", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|l:new_wxMDIClientWindow",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|l:new_wxMDIClientWindow",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -695,21 +710,21 @@ static PyObject *_wrap_new_wxMDIClientWindow(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef mdicMethods[] = {
-	 { "new_wxMDIClientWindow", _wrap_new_wxMDIClientWindow, METH_VARARGS },
-	 { "wxMDIChildFrame_Restore", _wrap_wxMDIChildFrame_Restore, METH_VARARGS },
-	 { "wxMDIChildFrame_Maximize", _wrap_wxMDIChildFrame_Maximize, METH_VARARGS },
-	 { "wxMDIChildFrame_Activate", _wrap_wxMDIChildFrame_Activate, METH_VARARGS },
-	 { "new_wxMDIChildFrame", _wrap_new_wxMDIChildFrame, METH_VARARGS },
-	 { "wxMDIParentFrame_Tile", _wrap_wxMDIParentFrame_Tile, METH_VARARGS },
-	 { "wxMDIParentFrame_SetToolBar", _wrap_wxMDIParentFrame_SetToolBar, METH_VARARGS },
-	 { "wxMDIParentFrame_GetToolBar", _wrap_wxMDIParentFrame_GetToolBar, METH_VARARGS },
-	 { "wxMDIParentFrame_GetClientWindow", _wrap_wxMDIParentFrame_GetClientWindow, METH_VARARGS },
-	 { "wxMDIParentFrame_GetActiveChild", _wrap_wxMDIParentFrame_GetActiveChild, METH_VARARGS },
-	 { "wxMDIParentFrame_Cascade", _wrap_wxMDIParentFrame_Cascade, METH_VARARGS },
-	 { "wxMDIParentFrame_ArrangeIcons", _wrap_wxMDIParentFrame_ArrangeIcons, METH_VARARGS },
-	 { "wxMDIParentFrame_ActivatePrevious", _wrap_wxMDIParentFrame_ActivatePrevious, METH_VARARGS },
-	 { "wxMDIParentFrame_ActivateNext", _wrap_wxMDIParentFrame_ActivateNext, METH_VARARGS },
-	 { "new_wxMDIParentFrame", _wrap_new_wxMDIParentFrame, METH_VARARGS },
+	 { "new_wxMDIClientWindow", (PyCFunction) _wrap_new_wxMDIClientWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIChildFrame_Restore", (PyCFunction) _wrap_wxMDIChildFrame_Restore, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIChildFrame_Maximize", (PyCFunction) _wrap_wxMDIChildFrame_Maximize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIChildFrame_Activate", (PyCFunction) _wrap_wxMDIChildFrame_Activate, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxMDIChildFrame", (PyCFunction) _wrap_new_wxMDIChildFrame, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_Tile", (PyCFunction) _wrap_wxMDIParentFrame_Tile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_SetToolBar", (PyCFunction) _wrap_wxMDIParentFrame_SetToolBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_GetToolBar", (PyCFunction) _wrap_wxMDIParentFrame_GetToolBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_GetClientWindow", (PyCFunction) _wrap_wxMDIParentFrame_GetClientWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_GetActiveChild", (PyCFunction) _wrap_wxMDIParentFrame_GetActiveChild, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_Cascade", (PyCFunction) _wrap_wxMDIParentFrame_Cascade, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_ArrangeIcons", (PyCFunction) _wrap_wxMDIParentFrame_ArrangeIcons, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_ActivatePrevious", (PyCFunction) _wrap_wxMDIParentFrame_ActivatePrevious, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMDIParentFrame_ActivateNext", (PyCFunction) _wrap_wxMDIParentFrame_ActivateNext, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxMDIParentFrame", (PyCFunction) _wrap_new_wxMDIParentFrame, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp
index 8daa610a09..a1e7938464 100644
--- a/utils/wxPython/src/msw/misc.cpp
+++ b/utils/wxPython/src/msw/misc.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 802)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -138,7 +138,7 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     char * _arg0;
@@ -151,9 +151,10 @@ static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
     int  _arg7 = (int ) -1;
     int  _arg8 = (int ) -1;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "message","default_path","default_filename","default_extension","wildcard","flags","parent","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|ssssiOii:wxFileSelector",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6,&_arg7,&_arg8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s|ssssiOii:wxFileSelector",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_argo6,&_arg7,&_arg8)) 
         return NULL;
     if (_argo6) {
         if (_argo6 == Py_None) { _arg6 = NULL; }
@@ -176,7 +177,7 @@ static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxString * _arg0;
@@ -191,9 +192,10 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     int tempbool6 = (int) TRUE;
+    char *_kwnames[] = { "message","caption","default_value","parent","x","y","centre", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|OOOiii:wxGetTextFromUser",&_obj0,&_obj1,&_obj2,&_argo3,&_arg4,&_arg5,&tempbool6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OOOiii:wxGetTextFromUser",_kwnames,&_obj0,&_obj1,&_obj2,&_argo3,&_arg4,&_arg5,&tempbool6)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -252,7 +254,7 @@ static PyObject *_wrap_wxGetTextFromUser(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxString * _arg0;
@@ -270,9 +272,10 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args) {
     PyObject * _obj3 = 0;
     PyObject * _argo4 = 0;
     int tempbool7 = (int) TRUE;
+    char *_kwnames[] = { "message","caption","LIST","parent","x","y","centre","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|Oiiiii:wxGetSingleChoice",&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|Oiiiii:wxGetSingleChoice",_kwnames,&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -336,7 +339,7 @@ static PyObject *_wrap_wxGetSingleChoice(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxString * _arg0;
@@ -354,9 +357,10 @@ static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args) {
     PyObject * _obj3 = 0;
     PyObject * _argo4 = 0;
     int tempbool7 = (int) TRUE;
+    char *_kwnames[] = { "message","caption","LIST","parent","x","y","centre","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|Oiiiii:wxGetSingleChoiceIndex",&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|Oiiiii:wxGetSingleChoiceIndex",_kwnames,&_obj0,&_obj1,&_obj3,&_argo4,&_arg5,&_arg6,&tempbool7,&_arg8,&_arg9)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -415,7 +419,7 @@ static PyObject *_wrap_wxGetSingleChoiceIndex(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxString * _arg0;
@@ -427,9 +431,10 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "message","caption","style","parent","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|OiOii:wxMessageBox",&_obj0,&_obj1,&_arg2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|OiOii:wxMessageBox",_kwnames,&_obj0,&_obj1,&_arg2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -470,7 +475,7 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxString * _arg0;
@@ -486,9 +491,10 @@ static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo6 = 0;
     PyObject * _argo7 = 0;
+    char *_kwnames[] = { "message","prompt","caption","value","min","max","parent","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOOl|llOO:wxGetNumberFromUser",&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argo6,&_argo7)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOl|llOO:wxGetNumberFromUser",_kwnames,&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argo6,&_argo7)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -546,12 +552,13 @@ static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxColourDisplay(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxColourDisplay(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxColourDisplay")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxColourDisplay",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -562,12 +569,13 @@ static PyObject *_wrap_wxColourDisplay(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxDisplayDepth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDisplayDepth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxDisplayDepth")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxDisplayDepth",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -578,13 +586,14 @@ static PyObject *_wrap_wxDisplayDepth(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCursor * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "cursor", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSetCursor",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSetCursor",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -603,12 +612,13 @@ static PyObject *_wrap_wxSetCursor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxNewId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNewId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxNewId")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxNewId",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -619,12 +629,13 @@ static PyObject *_wrap_wxNewId(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxRegisterId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegisterId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _arg0;
+    char *_kwnames[] = { "id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"l:wxRegisterId",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxRegisterId",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -636,12 +647,13 @@ static PyObject *_wrap_wxRegisterId(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_NewId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_NewId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":NewId")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":NewId",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -652,12 +664,13 @@ static PyObject *_wrap_NewId(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _arg0;
+    char *_kwnames[] = { "id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"l:RegisterId",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:RegisterId",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -669,13 +682,14 @@ static PyObject *_wrap_RegisterId(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxBeginBusyCursor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBeginBusyCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCursor * _arg0 = (wxCursor *) wxHOURGLASS_CURSOR;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "cursor", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|O:wxBeginBusyCursor",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:wxBeginBusyCursor",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -694,11 +708,12 @@ static PyObject *_wrap_wxBeginBusyCursor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxBell(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxBell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxBell")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxBell",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -710,12 +725,13 @@ static PyObject *_wrap_wxBell(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxDisplaySize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDisplaySize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int * _arg0;
     int  temp;
     int * _arg1;
     int  temp0;
+    char *_kwnames[] = {  NULL };
 
     self = self;
 {
@@ -724,7 +740,7 @@ static PyObject *_wrap_wxDisplaySize(PyObject *self, PyObject *args) {
 {
   _arg1 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,":wxDisplaySize")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxDisplaySize",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -746,11 +762,12 @@ static PyObject *_wrap_wxDisplaySize(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxEndBusyCursor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEndBusyCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxEndBusyCursor")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxEndBusyCursor",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -762,16 +779,17 @@ static PyObject *_wrap_wxEndBusyCursor(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxString * _arg0;
     bool  _arg1 = (bool ) FALSE;
     PyObject * _obj0 = 0;
     int tempbool1 = (int) FALSE;
+    char *_kwnames[] = { "command","sync", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxExecute",&_obj0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxExecute",_kwnames,&_obj0,&tempbool1)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -794,13 +812,14 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetActiveWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetActiveWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxGetActiveWindow")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetActiveWindow",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -817,14 +836,15 @@ static PyObject *_wrap_wxGetActiveWindow(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetElapsedTime(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetElapsedTime(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     bool  _arg0 = (bool ) TRUE;
     int tempbool0 = (int) TRUE;
+    char *_kwnames[] = { "resetTimer", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|i:wxGetElapsedTime",&tempbool0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|i:wxGetElapsedTime",_kwnames,&tempbool0)) 
         return NULL;
     _arg0 = (bool ) tempbool0;
 {
@@ -836,12 +856,13 @@ static PyObject *_wrap_wxGetElapsedTime(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetFreeMemory(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetFreeMemory(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxGetFreeMemory")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetFreeMemory",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -852,12 +873,13 @@ static PyObject *_wrap_wxGetFreeMemory(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetMousePosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetMousePosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int * _arg0;
     int  temp;
     int * _arg1;
     int  temp0;
+    char *_kwnames[] = {  NULL };
 
     self = self;
 {
@@ -866,7 +888,7 @@ static PyObject *_wrap_wxGetMousePosition(PyObject *self, PyObject *args) {
 {
   _arg1 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,":wxGetMousePosition")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetMousePosition",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -888,12 +910,13 @@ static PyObject *_wrap_wxGetMousePosition(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxIsBusy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIsBusy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxIsBusy")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxIsBusy",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -904,12 +927,13 @@ static PyObject *_wrap_wxIsBusy(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxNow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxNow")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxNow",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -925,14 +949,15 @@ static PyObject *_wrap_wxNow(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxShell(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxShell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxString * _arg0 = (wxString *) &wxPyEmptyStr;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "command", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|O:wxShell",&_obj0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:wxShell",_kwnames,&_obj0)) 
         return NULL;
     if (_obj0)
 {
@@ -955,11 +980,12 @@ static PyObject *_wrap_wxShell(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxStartTimer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStartTimer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxStartTimer")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxStartTimer",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -971,13 +997,14 @@ static PyObject *_wrap_wxStartTimer(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetOsVersion(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetOsVersion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     int * _arg0;
     int  temp;
     int * _arg1;
     int  temp0;
+    char *_kwnames[] = {  NULL };
 
     self = self;
 {
@@ -986,7 +1013,7 @@ static PyObject *_wrap_wxGetOsVersion(PyObject *self, PyObject *args) {
 {
   _arg1 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,":wxGetOsVersion")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxGetOsVersion",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1007,12 +1034,13 @@ static PyObject *_wrap_wxGetOsVersion(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxSleep(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSleep(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _arg0;
+    char *_kwnames[] = { "secs", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:wxSleep",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSleep",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1024,12 +1052,13 @@ static PyObject *_wrap_wxSleep(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxYield(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxYield(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxYield")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxYield",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1040,12 +1069,13 @@ static PyObject *_wrap_wxYield(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxSafeYield(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSafeYield(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxSafeYield")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxSafeYield",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1056,13 +1086,14 @@ static PyObject *_wrap_wxSafeYield(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxEnableTopLevelWindows(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEnableTopLevelWindows(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _arg0;
     int tempbool0;
+    char *_kwnames[] = { "enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:wxEnableTopLevelWindows",&tempbool0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxEnableTopLevelWindows",_kwnames,&tempbool0)) 
         return NULL;
     _arg0 = (bool ) tempbool0;
 {
@@ -1075,15 +1106,16 @@ static PyObject *_wrap_wxEnableTopLevelWindows(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     char * _result;
     char * _arg0;
     char * _arg1;
     char * _arg2 = (char *) NULL;
+    char *_kwnames[] = { "section","entry","file", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss|s:wxGetResource",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ss|s:wxGetResource",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1094,14 +1126,15 @@ static PyObject *_wrap_wxGetResource(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceAddIdentifier(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceAddIdentifier(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
     int  _arg1;
+    char *_kwnames[] = { "name","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"si:wxResourceAddIdentifier",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"si:wxResourceAddIdentifier",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1112,11 +1145,12 @@ static PyObject *_wrap_wxResourceAddIdentifier(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceClear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceClear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
+    char *_kwnames[] = {  NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxResourceClear")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxResourceClear",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1128,14 +1162,15 @@ static PyObject *_wrap_wxResourceClear(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceCreateBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceCreateBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     char * _arg0;
+    char *_kwnames[] = { "resource", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxResourceCreateBitmap",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxResourceCreateBitmap",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1147,14 +1182,15 @@ static PyObject *_wrap_wxResourceCreateBitmap(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceCreateIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceCreateIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIcon * _result;
     char * _arg0;
+    char *_kwnames[] = { "resource", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxResourceCreateIcon",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxResourceCreateIcon",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1166,14 +1202,15 @@ static PyObject *_wrap_wxResourceCreateIcon(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceCreateMenuBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceCreateMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _result;
     char * _arg0;
+    char *_kwnames[] = { "resource", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxResourceCreateMenuBar",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxResourceCreateMenuBar",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1190,13 +1227,14 @@ static PyObject *_wrap_wxResourceCreateMenuBar(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceGetIdentifier(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceGetIdentifier(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     char * _arg0;
+    char *_kwnames[] = { "name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s:wxResourceGetIdentifier",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxResourceGetIdentifier",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1207,15 +1245,16 @@ static PyObject *_wrap_wxResourceGetIdentifier(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceParseData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceParseData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
     wxResourceTable * _arg1 = (wxResourceTable *) NULL;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "resource","table", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseData",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s|O:wxResourceParseData",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -1233,15 +1272,16 @@ static PyObject *_wrap_wxResourceParseData(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceParseFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceParseFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
     wxResourceTable * _arg1 = (wxResourceTable *) NULL;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "filename","table", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseFile",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s|O:wxResourceParseFile",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -1259,15 +1299,16 @@ static PyObject *_wrap_wxResourceParseFile(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     char * _arg0;
     wxResourceTable * _arg1 = (wxResourceTable *) NULL;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "resource","table", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|O:wxResourceParseString",&_arg0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s|O:wxResourceParseString",_kwnames,&_arg0,&_argo1)) 
         return NULL;
     if (_argo1) {
         if (_argo1 == Py_None) { _arg1 = NULL; }
@@ -1285,14 +1326,15 @@ static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxSystemSettings_GetSystemColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSystemSettings_GetSystemColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     int  _arg0;
+    char *_kwnames[] = { "index", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemColour",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemColour",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1304,14 +1346,15 @@ static PyObject *_wrap_wxSystemSettings_GetSystemColour(PyObject *self, PyObject
     return _resultobj;
 }
 
-static PyObject *_wrap_wxSystemSettings_GetSystemFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSystemSettings_GetSystemFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     int  _arg0;
+    char *_kwnames[] = { "index", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemFont",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemFont",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1323,13 +1366,14 @@ static PyObject *_wrap_wxSystemSettings_GetSystemFont(PyObject *self, PyObject *
     return _resultobj;
 }
 
-static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     int  _arg0;
+    char *_kwnames[] = { "index", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemMetric",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxSystemSettings_GetSystemMetric",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1341,15 +1385,16 @@ static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject
 }
 
 #define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
-static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxSize_x_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_x_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1368,14 +1413,15 @@ static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_x_get(_swigobj) ((long ) _swigobj->x)
-static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSize_x_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_x_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1394,15 +1440,16 @@ static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)
-static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxSize_y_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_y_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1421,14 +1468,15 @@ static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_y_get(_swigobj) ((long ) _swigobj->y)
-static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSize_y_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_y_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1447,15 +1495,16 @@ static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) {
 }
 
 #define new_wxSize(_swigarg0,_swigarg1) (new wxSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     long  _arg0 = (long ) 0;
     long  _arg1 = (long ) 0;
+    char *_kwnames[] = { "w","h", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|ll:new_wxSize",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ll:new_wxSize",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1473,13 +1522,14 @@ static PyObject *_wrap_new_wxSize(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxSize(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1499,15 +1549,16 @@ static PyObject *_wrap_delete_wxSize(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_Set(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Set(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","w","h", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxSize_Set",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxSize_Set",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1527,14 +1578,15 @@ static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_GetX(_swigobj)  (_swigobj->GetX())
-static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSize_GetX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1553,14 +1605,15 @@ static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_GetY(_swigobj)  (_swigobj->GetY())
-static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSize_GetY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1579,14 +1632,15 @@ static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_GetWidth(_swigobj)  (_swigobj->GetWidth())
-static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSize_GetWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1605,14 +1659,15 @@ static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_GetHeight(_swigobj)  (_swigobj->GetHeight())
-static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSize_GetHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_GetHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1631,14 +1686,15 @@ static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_SetWidth(_swigobj,_swigarg0)  (_swigobj->SetWidth(_swigarg0))
-static PyObject *_wrap_wxSize_SetWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxSize_SetWidth",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_SetWidth",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1658,14 +1714,15 @@ static PyObject *_wrap_wxSize_SetWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxSize_SetHeight(_swigobj,_swigarg0)  (_swigobj->SetHeight(_swigarg0))
-static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","h", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxSize_SetHeight",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxSize_SetHeight",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1690,14 +1747,15 @@ static PyObject * wxSize_asTuple(wxSize *self) {
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
-static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxSize * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSize_asTuple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSize_asTuple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1718,15 +1776,16 @@ static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args) {
 }
 
 #define wxRealPoint_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
-static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Od:wxRealPoint_x_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxRealPoint_x_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1745,14 +1804,15 @@ static PyObject *_wrap_wxRealPoint_x_set(PyObject *self, PyObject *args) {
 }
 
 #define wxRealPoint_x_get(_swigobj) ((double ) _swigobj->x)
-static PyObject *_wrap_wxRealPoint_x_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRealPoint_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRealPoint_x_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_x_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1771,15 +1831,16 @@ static PyObject *_wrap_wxRealPoint_x_get(PyObject *self, PyObject *args) {
 }
 
 #define wxRealPoint_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)
-static PyObject *_wrap_wxRealPoint_y_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRealPoint_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
     double  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Od:wxRealPoint_y_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Od:wxRealPoint_y_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1798,14 +1859,15 @@ static PyObject *_wrap_wxRealPoint_y_set(PyObject *self, PyObject *args) {
 }
 
 #define wxRealPoint_y_get(_swigobj) ((double ) _swigobj->y)
-static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     double  _result;
     wxRealPoint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRealPoint_y_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_y_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1824,15 +1886,16 @@ static PyObject *_wrap_wxRealPoint_y_get(PyObject *self, PyObject *args) {
 }
 
 #define new_wxRealPoint(_swigarg0,_swigarg1) (new wxRealPoint(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRealPoint * _result;
     double  _arg0 = (double ) 0.0;
     double  _arg1 = (double ) 0.0;
+    char *_kwnames[] = { "x","y", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|dd:new_wxRealPoint",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|dd:new_wxRealPoint",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1850,13 +1913,14 @@ static PyObject *_wrap_new_wxRealPoint(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxRealPoint(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRealPoint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxRealPoint",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRealPoint",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1875,16 +1939,83 @@ static PyObject *_wrap_delete_wxRealPoint(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+static void  wxRealPoint_Set(wxRealPoint *self,double  x,double  y) {
+            self->x = x;
+            self->y = y;
+        }
+static PyObject *_wrap_wxRealPoint_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxRealPoint * _arg0;
+    double  _arg1;
+    double  _arg2;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Odd:wxRealPoint_Set",_kwnames,&_argo0,&_arg1,&_arg2)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_Set. Expected _wxRealPoint_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxRealPoint_Set(_arg0,_arg1,_arg2);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
+static PyObject * wxRealPoint_asTuple(wxRealPoint *self) {
+            PyObject* tup = PyTuple_New(2);
+            PyTuple_SET_ITEM(tup, 0, PyFloat_FromDouble(self->x));
+            PyTuple_SET_ITEM(tup, 1, PyFloat_FromDouble(self->y));
+            return tup;
+        }
+static PyObject *_wrap_wxRealPoint_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    PyObject * _result;
+    wxRealPoint * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRealPoint_asTuple",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxRealPoint_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRealPoint_asTuple. Expected _wxRealPoint_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        _result = (PyObject *)wxRealPoint_asTuple(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}{
+  _resultobj = _result;
+}
+    return _resultobj;
+}
+
 #define wxPoint_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
-static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxPoint_x_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPoint_x_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1903,14 +2034,15 @@ static PyObject *_wrap_wxPoint_x_set(PyObject *self, PyObject *args) {
 }
 
 #define wxPoint_x_get(_swigobj) ((long ) _swigobj->x)
-static PyObject *_wrap_wxPoint_x_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPoint_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPoint_x_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_x_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1929,15 +2061,16 @@ static PyObject *_wrap_wxPoint_x_get(PyObject *self, PyObject *args) {
 }
 
 #define wxPoint_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)
-static PyObject *_wrap_wxPoint_y_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPoint_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxPoint_y_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxPoint_y_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1956,14 +2089,15 @@ static PyObject *_wrap_wxPoint_y_set(PyObject *self, PyObject *args) {
 }
 
 #define wxPoint_y_get(_swigobj) ((long ) _swigobj->y)
-static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxPoint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPoint_y_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_y_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1982,15 +2116,16 @@ static PyObject *_wrap_wxPoint_y_get(PyObject *self, PyObject *args) {
 }
 
 #define new_wxPoint(_swigarg0,_swigarg1) (new wxPoint(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     long  _arg0 = (long ) 0;
     long  _arg1 = (long ) 0;
+    char *_kwnames[] = { "x","y", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|ll:new_wxPoint",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ll:new_wxPoint",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2008,13 +2143,14 @@ static PyObject *_wrap_new_wxPoint(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxPoint(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPoint",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPoint",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2037,15 +2173,16 @@ static void  wxPoint_Set(wxPoint *self,long  x,long  y) {
             self->x = x;
             self->y = y;
         }
-static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxPoint_Set",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxPoint_Set",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2070,14 +2207,15 @@ static PyObject * wxPoint_asTuple(wxPoint *self) {
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y));
             return tup;
         }
-static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxPoint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPoint_asTuple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPoint_asTuple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2098,17 +2236,18 @@ static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) {
 }
 
 #define new_wxRect(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxRect(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     long  _arg0 = (long ) 0;
     long  _arg1 = (long ) 0;
     long  _arg2 = (long ) 0;
     long  _arg3 = (long ) 0;
+    char *_kwnames[] = { "x","y","w","h", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|llll:new_wxRect",&_arg0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|llll:new_wxRect",_kwnames,&_arg0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2126,13 +2265,14 @@ static PyObject *_wrap_new_wxRect(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxRect(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxRect",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRect",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2152,14 +2292,15 @@ static PyObject *_wrap_delete_wxRect(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetX(_swigobj)  (_swigobj->GetX())
-static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2178,14 +2319,15 @@ static PyObject *_wrap_wxRect_GetX(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_SetX(_swigobj,_swigarg0)  (_swigobj->SetX(_swigarg0))
-static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","X", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetX",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetX",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2205,14 +2347,15 @@ static PyObject *_wrap_wxRect_SetX(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetY(_swigobj)  (_swigobj->GetY())
-static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2231,14 +2374,15 @@ static PyObject *_wrap_wxRect_GetY(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_SetY(_swigobj,_swigarg0)  (_swigobj->SetY(_swigarg0))
-static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","Y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetY",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetY",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2258,14 +2402,15 @@ static PyObject *_wrap_wxRect_SetY(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetWidth(_swigobj)  (_swigobj->GetWidth())
-static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2284,14 +2429,15 @@ static PyObject *_wrap_wxRect_GetWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_SetWidth(_swigobj,_swigarg0)  (_swigobj->SetWidth(_swigarg0))
-static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","w", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetWidth",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetWidth",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2311,14 +2457,15 @@ static PyObject *_wrap_wxRect_SetWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetHeight(_swigobj)  (_swigobj->GetHeight())
-static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2337,14 +2484,15 @@ static PyObject *_wrap_wxRect_GetHeight(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_SetHeight(_swigobj,_swigarg0)  (_swigobj->SetHeight(_swigarg0))
-static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","h", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_SetHeight",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_SetHeight",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2364,15 +2512,16 @@ static PyObject *_wrap_wxRect_SetHeight(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxRect_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2392,15 +2541,16 @@ static PyObject *_wrap_wxRect_GetPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetSize(_swigobj)  (_swigobj->GetSize())
-static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2420,14 +2570,15 @@ static PyObject *_wrap_wxRect_GetSize(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetLeft(_swigobj)  (_swigobj->GetLeft())
-static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetLeft",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetLeft",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2446,14 +2597,15 @@ static PyObject *_wrap_wxRect_GetLeft(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetTop(_swigobj)  (_swigobj->GetTop())
-static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetTop",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetTop",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2472,14 +2624,15 @@ static PyObject *_wrap_wxRect_GetTop(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetBottom(_swigobj)  (_swigobj->GetBottom())
-static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetBottom",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetBottom",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2498,14 +2651,15 @@ static PyObject *_wrap_wxRect_GetBottom(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_GetRight(_swigobj)  (_swigobj->GetRight())
-static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_GetRight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_GetRight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2524,15 +2678,16 @@ static PyObject *_wrap_wxRect_GetRight(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
-static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_x_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_x_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2551,14 +2706,15 @@ static PyObject *_wrap_wxRect_x_set(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_x_get(_swigobj) ((long ) _swigobj->x)
-static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_x_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_x_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2577,15 +2733,16 @@ static PyObject *_wrap_wxRect_x_get(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval)
-static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_y_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_y_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2604,14 +2761,15 @@ static PyObject *_wrap_wxRect_y_set(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_y_get(_swigobj) ((long ) _swigobj->y)
-static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_y_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_y_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2630,15 +2788,16 @@ static PyObject *_wrap_wxRect_y_get(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_width_set(_swigobj,_swigval) (_swigobj->width = _swigval,_swigval)
-static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_width_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_width_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2657,14 +2816,15 @@ static PyObject *_wrap_wxRect_width_set(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_width_get(_swigobj) ((long ) _swigobj->width)
-static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_width_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_width_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2683,15 +2843,16 @@ static PyObject *_wrap_wxRect_width_get(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_height_set(_swigobj,_swigval) (_swigobj->height = _swigval,_swigval)
-static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxRect_height_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxRect_height_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2710,14 +2871,15 @@ static PyObject *_wrap_wxRect_height_set(PyObject *self, PyObject *args) {
 }
 
 #define wxRect_height_get(_swigobj) ((long ) _swigobj->height)
-static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_height_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_height_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2743,14 +2905,15 @@ static PyObject * wxRect_asTuple(wxRect *self) {
             PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->height));
             return tup;
         }
-static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxRect * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRect_asTuple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRect_asTuple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2771,15 +2934,16 @@ static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args) {
 }
 
 #define new_wxPyTimer(_swigarg0) (new wxPyTimer(_swigarg0))
-static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTimer * _result;
     PyObject * _arg0;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "notify", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:new_wxPyTimer",&_obj0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxPyTimer",_kwnames,&_obj0)) 
         return NULL;
 {
   _arg0 = _obj0;
@@ -2800,13 +2964,14 @@ static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxPyTimer(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPyTimer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPyTimer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPyTimer",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPyTimer",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2826,14 +2991,15 @@ static PyObject *_wrap_delete_wxPyTimer(PyObject *self, PyObject *args) {
 }
 
 #define wxPyTimer_Interval(_swigobj)  (_swigobj->Interval())
-static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPyTimer * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyTimer_Interval",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyTimer_Interval",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2852,15 +3018,16 @@ static PyObject *_wrap_wxPyTimer_Interval(PyObject *self, PyObject *args) {
 }
 
 #define wxPyTimer_Start(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Start(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
     int  _arg1 = (int ) -1;
     int  _arg2 = (int ) FALSE;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","milliseconds","oneShot", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|ii:wxPyTimer_Start",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:wxPyTimer_Start",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2880,13 +3047,14 @@ static PyObject *_wrap_wxPyTimer_Start(PyObject *self, PyObject *args) {
 }
 
 #define wxPyTimer_Stop(_swigobj)  (_swigobj->Stop())
-static PyObject *_wrap_wxPyTimer_Stop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyTimer_Stop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyTimer * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyTimer_Stop",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyTimer_Stop",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2906,16 +3074,17 @@ static PyObject *_wrap_wxPyTimer_Stop(PyObject *self, PyObject *args) {
 }
 
 #define wxIndividualLayoutConstraint_Above(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Above(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","otherWin","margin", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_Above",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxIndividualLayoutConstraint_Above",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2942,14 +3111,15 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Above(PyObject *self, PyObje
 }
 
 #define wxIndividualLayoutConstraint_Absolute(_swigobj,_swigarg0)  (_swigobj->Absolute(_swigarg0))
-static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxIndividualLayoutConstraint_Absolute",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIndividualLayoutConstraint_Absolute",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2969,13 +3139,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Absolute(PyObject *self, PyO
 }
 
 #define wxIndividualLayoutConstraint_AsIs(_swigobj)  (_swigobj->AsIs())
-static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxIndividualLayoutConstraint_AsIs",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIndividualLayoutConstraint_AsIs",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2995,16 +3166,17 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_AsIs(PyObject *self, PyObjec
 }
 
 #define wxIndividualLayoutConstraint_Below(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Below(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","otherWin","margin", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_Below",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxIndividualLayoutConstraint_Below",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3031,13 +3203,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Below(PyObject *self, PyObje
 }
 
 #define wxIndividualLayoutConstraint_Unconstrained(_swigobj)  (_swigobj->Unconstrained())
-static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxIndividualLayoutConstraint_Unconstrained",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIndividualLayoutConstraint_Unconstrained",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3057,16 +3230,17 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Unconstrained(PyObject *self
 }
 
 #define wxIndividualLayoutConstraint_LeftOf(_swigobj,_swigarg0,_swigarg1)  (_swigobj->LeftOf(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","otherWin","margin", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_LeftOf",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxIndividualLayoutConstraint_LeftOf",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3093,7 +3267,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_LeftOf(PyObject *self, PyObj
 }
 
 #define wxIndividualLayoutConstraint_PercentOf(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PercentOf(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
@@ -3101,9 +3275,10 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *self, Py
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","otherWin","edge","percent", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOii:wxIndividualLayoutConstraint_PercentOf",&_argo0,&_argo1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxIndividualLayoutConstraint_PercentOf",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3130,16 +3305,17 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_PercentOf(PyObject *self, Py
 }
 
 #define wxIndividualLayoutConstraint_RightOf(_swigobj,_swigarg0,_swigarg1)  (_swigobj->RightOf(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","otherWin","margin", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxIndividualLayoutConstraint_RightOf",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxIndividualLayoutConstraint_RightOf",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3166,7 +3342,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_RightOf(PyObject *self, PyOb
 }
 
 #define wxIndividualLayoutConstraint_SameAs(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SameAs(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxWindow * _arg1;
@@ -3174,9 +3350,10 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *self, PyObj
     int  _arg3 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","otherWin","edge","margin", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOi|i:wxIndividualLayoutConstraint_SameAs",&_argo0,&_argo1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi|i:wxIndividualLayoutConstraint_SameAs",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3203,7 +3380,7 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_SameAs(PyObject *self, PyObj
 }
 
 #define wxIndividualLayoutConstraint_Set(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->Set(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _arg0;
     wxRelationship  _arg1;
@@ -3213,9 +3390,10 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *self, PyObject
     int  _arg5 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","rel","otherWin","otherEdge","value","margin", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiOi|ii:wxIndividualLayoutConstraint_Set",&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOi|ii:wxIndividualLayoutConstraint_Set",_kwnames,&_argo0,&_arg1,&_argo2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3242,13 +3420,14 @@ static PyObject *_wrap_wxIndividualLayoutConstraint_Set(PyObject *self, PyObject
 }
 
 #define new_wxLayoutConstraints() (new wxLayoutConstraints())
-static PyObject *_wrap_new_wxLayoutConstraints(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxLayoutConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutConstraints * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxLayoutConstraints")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxLayoutConstraints",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3266,15 +3445,16 @@ static PyObject *_wrap_new_wxLayoutConstraints(PyObject *self, PyObject *args) {
 }
 
 #define wxLayoutConstraints_bottom_get(_swigobj) (&_swigobj->bottom)
-static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_bottom_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_bottom_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3299,15 +3479,16 @@ static PyObject *_wrap_wxLayoutConstraints_bottom_get(PyObject *self, PyObject *
 }
 
 #define wxLayoutConstraints_centreX_get(_swigobj) (&_swigobj->centreX)
-static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_centreX_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_centreX_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3332,15 +3513,16 @@ static PyObject *_wrap_wxLayoutConstraints_centreX_get(PyObject *self, PyObject
 }
 
 #define wxLayoutConstraints_centreY_get(_swigobj) (&_swigobj->centreY)
-static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_centreY_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_centreY_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3365,15 +3547,16 @@ static PyObject *_wrap_wxLayoutConstraints_centreY_get(PyObject *self, PyObject
 }
 
 #define wxLayoutConstraints_height_get(_swigobj) (&_swigobj->height)
-static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_height_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_height_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3398,15 +3581,16 @@ static PyObject *_wrap_wxLayoutConstraints_height_get(PyObject *self, PyObject *
 }
 
 #define wxLayoutConstraints_left_get(_swigobj) (&_swigobj->left)
-static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_left_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_left_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3431,15 +3615,16 @@ static PyObject *_wrap_wxLayoutConstraints_left_get(PyObject *self, PyObject *ar
 }
 
 #define wxLayoutConstraints_right_get(_swigobj) (&_swigobj->right)
-static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_right_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_right_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3464,15 +3649,16 @@ static PyObject *_wrap_wxLayoutConstraints_right_get(PyObject *self, PyObject *a
 }
 
 #define wxLayoutConstraints_top_get(_swigobj) (&_swigobj->top)
-static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_top_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_top_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3497,15 +3683,16 @@ static PyObject *_wrap_wxLayoutConstraints_top_get(PyObject *self, PyObject *arg
 }
 
 #define wxLayoutConstraints_width_get(_swigobj) (&_swigobj->width)
-static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIndividualLayoutConstraint * _result;
     wxLayoutConstraints * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxLayoutConstraints_width_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxLayoutConstraints_width_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3530,13 +3717,14 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a
 }
 
 #define new_wxRegion() (new wxRegion())
-static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegion * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxRegion")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxRegion",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -3554,13 +3742,14 @@ static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxRegion(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegion * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxRegion",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRegion",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3580,13 +3769,14 @@ static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_Clear(_swigobj)  (_swigobj->Clear())
-static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegion * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegion_Clear",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegion_Clear",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3606,16 +3796,17 @@ static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_Contains(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Contains(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxRegion_Contains(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_Contains(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegionContain  _result;
     wxRegion * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxRegion_Contains",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxRegion_Contains",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3634,16 +3825,17 @@ static PyObject *_wrap_wxRegion_Contains(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_ContainsPoint(_swigobj,_swigarg0)  (_swigobj->Contains(_swigarg0))
-static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRegion_ContainsPoint",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_ContainsPoint",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3669,16 +3861,17 @@ static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_ContainsRect(_swigobj,_swigarg0)  (_swigobj->Contains(_swigarg0))
-static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegionContain  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRegion_ContainsRect",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_ContainsRect",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3704,15 +3897,16 @@ static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_GetBox(_swigobj)  (_swigobj->GetBox())
-static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxRegion * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegion_GetBox",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegion_GetBox",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3732,16 +3926,17 @@ static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_Intersect(_swigobj,_swigarg0)  (_swigobj->Intersect(_swigarg0))
-static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRegion_Intersect",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Intersect",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3767,14 +3962,15 @@ static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_IsEmpty(_swigobj)  (_swigobj->IsEmpty())
-static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegion_IsEmpty",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegion_IsEmpty",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3793,16 +3989,17 @@ static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_Subtract(_swigobj,_swigarg0)  (_swigobj->Subtract(_swigarg0))
-static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRegion_Subtract",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Subtract",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3828,16 +4025,17 @@ static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_Union(_swigobj,_swigarg0)  (_swigobj->Union(_swigarg0))
-static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRegion_Union",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Union",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3863,16 +4061,17 @@ static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args) {
 }
 
 #define wxRegion_Xor(_swigobj,_swigarg0)  (_swigobj->Xor(_swigarg0))
-static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRegion * _arg0;
     wxRect * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxRegion_Xor",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxRegion_Xor",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3898,15 +4097,16 @@ static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args) {
 }
 
 #define new_wxRegionIterator(_swigarg0) (new wxRegionIterator(_swigarg0))
-static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegionIterator * _result;
     wxRegion * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "region", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:new_wxRegionIterator",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxRegionIterator",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3931,13 +4131,14 @@ static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxRegionIterator(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxRegionIterator",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxRegionIterator",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3957,14 +4158,15 @@ static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args) {
 }
 
 #define wxRegionIterator_GetX(_swigobj)  (_swigobj->GetX())
-static PyObject *_wrap_wxRegionIterator_GetX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_GetX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3983,14 +4185,15 @@ static PyObject *_wrap_wxRegionIterator_GetX(PyObject *self, PyObject *args) {
 }
 
 #define wxRegionIterator_GetY(_swigobj)  (_swigobj->GetY())
-static PyObject *_wrap_wxRegionIterator_GetY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_GetY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4009,14 +4212,15 @@ static PyObject *_wrap_wxRegionIterator_GetY(PyObject *self, PyObject *args) {
 }
 
 #define wxRegionIterator_GetW(_swigobj)  (_swigobj->GetW())
-static PyObject *_wrap_wxRegionIterator_GetW(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_GetW(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetW",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_GetW",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4035,14 +4239,15 @@ static PyObject *_wrap_wxRegionIterator_GetW(PyObject *self, PyObject *args) {
 }
 
 #define wxRegionIterator_GetWidth(_swigobj)  (_swigobj->GetWidth())
-static PyObject *_wrap_wxRegionIterator_GetWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_GetWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4061,14 +4266,15 @@ static PyObject *_wrap_wxRegionIterator_GetWidth(PyObject *self, PyObject *args)
 }
 
 #define wxRegionIterator_GetH(_swigobj)  (_swigobj->GetH())
-static PyObject *_wrap_wxRegionIterator_GetH(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_GetH(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetH",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_GetH",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4087,14 +4293,15 @@ static PyObject *_wrap_wxRegionIterator_GetH(PyObject *self, PyObject *args) {
 }
 
 #define wxRegionIterator_GetHeight(_swigobj)  (_swigobj->GetHeight())
-static PyObject *_wrap_wxRegionIterator_GetHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_GetHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4113,15 +4320,16 @@ static PyObject *_wrap_wxRegionIterator_GetHeight(PyObject *self, PyObject *args
 }
 
 #define wxRegionIterator_GetRect(_swigobj)  (_swigobj->GetRect())
-static PyObject *_wrap_wxRegionIterator_GetRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_GetRect",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_GetRect",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4141,14 +4349,15 @@ static PyObject *_wrap_wxRegionIterator_GetRect(PyObject *self, PyObject *args)
 }
 
 #define wxRegionIterator_HaveRects(_swigobj)  (_swigobj->HaveRects())
-static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_HaveRects",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_HaveRects",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4167,13 +4376,14 @@ static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args
 }
 
 #define wxRegionIterator_Reset(_swigobj)  (_swigobj->Reset())
-static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_Reset",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_Reset",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4195,13 +4405,14 @@ static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args) {
 static void  wxRegionIterator_Next(wxRegionIterator *self) {
             (*self) ++;
         }
-static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegionIterator * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxRegionIterator_Next",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxRegionIterator_Next",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4221,16 +4432,17 @@ static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) {
 }
 
 #define new_wxAcceleratorEntry(_swigarg0,_swigarg1,_swigarg2) (new wxAcceleratorEntry(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxAcceleratorEntry * _result;
     int  _arg0 = (int ) 0;
     int  _arg1 = (int ) 0;
     int  _arg2 = (int ) 0;
+    char *_kwnames[] = { "flags","keyCode","cmd", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|iii:new_wxAcceleratorEntry",&_arg0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iii:new_wxAcceleratorEntry",_kwnames,&_arg0,&_arg1,&_arg2)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4248,16 +4460,17 @@ static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) {
 }
 
 #define wxAcceleratorEntry_Set(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->Set(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxAcceleratorEntry * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","flags","keyCode","Cmd", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiii:wxAcceleratorEntry_Set",&_argo0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxAcceleratorEntry_Set",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4277,14 +4490,15 @@ static PyObject *_wrap_wxAcceleratorEntry_Set(PyObject *self, PyObject *args) {
 }
 
 #define wxAcceleratorEntry_GetFlags(_swigobj)  (_swigobj->GetFlags())
-static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetFlags",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxAcceleratorEntry_GetFlags",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4303,14 +4517,15 @@ static PyObject *_wrap_wxAcceleratorEntry_GetFlags(PyObject *self, PyObject *arg
 }
 
 #define wxAcceleratorEntry_GetKeyCode(_swigobj)  (_swigobj->GetKeyCode())
-static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetKeyCode",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxAcceleratorEntry_GetKeyCode",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4329,14 +4544,15 @@ static PyObject *_wrap_wxAcceleratorEntry_GetKeyCode(PyObject *self, PyObject *a
 }
 
 #define wxAcceleratorEntry_GetCommand(_swigobj)  (_swigobj->GetCommand())
-static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxAcceleratorEntry * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxAcceleratorEntry_GetCommand",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxAcceleratorEntry_GetCommand",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4355,16 +4571,17 @@ static PyObject *_wrap_wxAcceleratorEntry_GetCommand(PyObject *self, PyObject *a
 }
 
 #define new_wxAcceleratorTable(_swigarg0,_swigarg1) (new wxAcceleratorTable(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxAcceleratorTable * _result;
     int  _arg0;
     wxAcceleratorEntry * _arg1;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "LIST", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:new_wxAcceleratorTable",&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxAcceleratorTable",_kwnames,&_obj1)) 
         return NULL;
     if (_obj1)
 {
@@ -4400,161 +4617,163 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef misccMethods[] = {
-	 { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, METH_VARARGS },
-	 { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, METH_VARARGS },
-	 { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, METH_VARARGS },
-	 { "wxAcceleratorEntry_GetFlags", _wrap_wxAcceleratorEntry_GetFlags, METH_VARARGS },
-	 { "wxAcceleratorEntry_Set", _wrap_wxAcceleratorEntry_Set, METH_VARARGS },
-	 { "new_wxAcceleratorEntry", _wrap_new_wxAcceleratorEntry, METH_VARARGS },
-	 { "wxRegionIterator_Next", _wrap_wxRegionIterator_Next, METH_VARARGS },
-	 { "wxRegionIterator_Reset", _wrap_wxRegionIterator_Reset, METH_VARARGS },
-	 { "wxRegionIterator_HaveRects", _wrap_wxRegionIterator_HaveRects, METH_VARARGS },
-	 { "wxRegionIterator_GetRect", _wrap_wxRegionIterator_GetRect, METH_VARARGS },
-	 { "wxRegionIterator_GetHeight", _wrap_wxRegionIterator_GetHeight, METH_VARARGS },
-	 { "wxRegionIterator_GetH", _wrap_wxRegionIterator_GetH, METH_VARARGS },
-	 { "wxRegionIterator_GetWidth", _wrap_wxRegionIterator_GetWidth, METH_VARARGS },
-	 { "wxRegionIterator_GetW", _wrap_wxRegionIterator_GetW, METH_VARARGS },
-	 { "wxRegionIterator_GetY", _wrap_wxRegionIterator_GetY, METH_VARARGS },
-	 { "wxRegionIterator_GetX", _wrap_wxRegionIterator_GetX, METH_VARARGS },
-	 { "delete_wxRegionIterator", _wrap_delete_wxRegionIterator, METH_VARARGS },
-	 { "new_wxRegionIterator", _wrap_new_wxRegionIterator, METH_VARARGS },
-	 { "wxRegion_Xor", _wrap_wxRegion_Xor, METH_VARARGS },
-	 { "wxRegion_Union", _wrap_wxRegion_Union, METH_VARARGS },
-	 { "wxRegion_Subtract", _wrap_wxRegion_Subtract, METH_VARARGS },
-	 { "wxRegion_IsEmpty", _wrap_wxRegion_IsEmpty, METH_VARARGS },
-	 { "wxRegion_Intersect", _wrap_wxRegion_Intersect, METH_VARARGS },
-	 { "wxRegion_GetBox", _wrap_wxRegion_GetBox, METH_VARARGS },
-	 { "wxRegion_ContainsRect", _wrap_wxRegion_ContainsRect, METH_VARARGS },
-	 { "wxRegion_ContainsPoint", _wrap_wxRegion_ContainsPoint, METH_VARARGS },
-	 { "wxRegion_Contains", _wrap_wxRegion_Contains, METH_VARARGS },
-	 { "wxRegion_Clear", _wrap_wxRegion_Clear, METH_VARARGS },
-	 { "delete_wxRegion", _wrap_delete_wxRegion, METH_VARARGS },
-	 { "new_wxRegion", _wrap_new_wxRegion, METH_VARARGS },
-	 { "wxLayoutConstraints_width_get", _wrap_wxLayoutConstraints_width_get, METH_VARARGS },
-	 { "wxLayoutConstraints_top_get", _wrap_wxLayoutConstraints_top_get, METH_VARARGS },
-	 { "wxLayoutConstraints_right_get", _wrap_wxLayoutConstraints_right_get, METH_VARARGS },
-	 { "wxLayoutConstraints_left_get", _wrap_wxLayoutConstraints_left_get, METH_VARARGS },
-	 { "wxLayoutConstraints_height_get", _wrap_wxLayoutConstraints_height_get, METH_VARARGS },
-	 { "wxLayoutConstraints_centreY_get", _wrap_wxLayoutConstraints_centreY_get, METH_VARARGS },
-	 { "wxLayoutConstraints_centreX_get", _wrap_wxLayoutConstraints_centreX_get, METH_VARARGS },
-	 { "wxLayoutConstraints_bottom_get", _wrap_wxLayoutConstraints_bottom_get, METH_VARARGS },
-	 { "new_wxLayoutConstraints", _wrap_new_wxLayoutConstraints, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_Set", _wrap_wxIndividualLayoutConstraint_Set, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_SameAs", _wrap_wxIndividualLayoutConstraint_SameAs, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_RightOf", _wrap_wxIndividualLayoutConstraint_RightOf, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_PercentOf", _wrap_wxIndividualLayoutConstraint_PercentOf, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_LeftOf", _wrap_wxIndividualLayoutConstraint_LeftOf, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_Unconstrained", _wrap_wxIndividualLayoutConstraint_Unconstrained, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_Below", _wrap_wxIndividualLayoutConstraint_Below, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_AsIs", _wrap_wxIndividualLayoutConstraint_AsIs, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_Absolute", _wrap_wxIndividualLayoutConstraint_Absolute, METH_VARARGS },
-	 { "wxIndividualLayoutConstraint_Above", _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS },
-	 { "wxPyTimer_Stop", _wrap_wxPyTimer_Stop, METH_VARARGS },
-	 { "wxPyTimer_Start", _wrap_wxPyTimer_Start, METH_VARARGS },
-	 { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, METH_VARARGS },
-	 { "delete_wxPyTimer", _wrap_delete_wxPyTimer, METH_VARARGS },
-	 { "new_wxPyTimer", _wrap_new_wxPyTimer, METH_VARARGS },
-	 { "wxRect_asTuple", _wrap_wxRect_asTuple, METH_VARARGS },
-	 { "wxRect_height_get", _wrap_wxRect_height_get, METH_VARARGS },
-	 { "wxRect_height_set", _wrap_wxRect_height_set, METH_VARARGS },
-	 { "wxRect_width_get", _wrap_wxRect_width_get, METH_VARARGS },
-	 { "wxRect_width_set", _wrap_wxRect_width_set, METH_VARARGS },
-	 { "wxRect_y_get", _wrap_wxRect_y_get, METH_VARARGS },
-	 { "wxRect_y_set", _wrap_wxRect_y_set, METH_VARARGS },
-	 { "wxRect_x_get", _wrap_wxRect_x_get, METH_VARARGS },
-	 { "wxRect_x_set", _wrap_wxRect_x_set, METH_VARARGS },
-	 { "wxRect_GetRight", _wrap_wxRect_GetRight, METH_VARARGS },
-	 { "wxRect_GetBottom", _wrap_wxRect_GetBottom, METH_VARARGS },
-	 { "wxRect_GetTop", _wrap_wxRect_GetTop, METH_VARARGS },
-	 { "wxRect_GetLeft", _wrap_wxRect_GetLeft, METH_VARARGS },
-	 { "wxRect_GetSize", _wrap_wxRect_GetSize, METH_VARARGS },
-	 { "wxRect_GetPosition", _wrap_wxRect_GetPosition, METH_VARARGS },
-	 { "wxRect_SetHeight", _wrap_wxRect_SetHeight, METH_VARARGS },
-	 { "wxRect_GetHeight", _wrap_wxRect_GetHeight, METH_VARARGS },
-	 { "wxRect_SetWidth", _wrap_wxRect_SetWidth, METH_VARARGS },
-	 { "wxRect_GetWidth", _wrap_wxRect_GetWidth, METH_VARARGS },
-	 { "wxRect_SetY", _wrap_wxRect_SetY, METH_VARARGS },
-	 { "wxRect_GetY", _wrap_wxRect_GetY, METH_VARARGS },
-	 { "wxRect_SetX", _wrap_wxRect_SetX, METH_VARARGS },
-	 { "wxRect_GetX", _wrap_wxRect_GetX, METH_VARARGS },
-	 { "delete_wxRect", _wrap_delete_wxRect, METH_VARARGS },
-	 { "new_wxRect", _wrap_new_wxRect, METH_VARARGS },
-	 { "wxPoint_asTuple", _wrap_wxPoint_asTuple, METH_VARARGS },
-	 { "wxPoint_Set", _wrap_wxPoint_Set, METH_VARARGS },
-	 { "delete_wxPoint", _wrap_delete_wxPoint, METH_VARARGS },
-	 { "new_wxPoint", _wrap_new_wxPoint, METH_VARARGS },
-	 { "wxPoint_y_get", _wrap_wxPoint_y_get, METH_VARARGS },
-	 { "wxPoint_y_set", _wrap_wxPoint_y_set, METH_VARARGS },
-	 { "wxPoint_x_get", _wrap_wxPoint_x_get, METH_VARARGS },
-	 { "wxPoint_x_set", _wrap_wxPoint_x_set, METH_VARARGS },
-	 { "delete_wxRealPoint", _wrap_delete_wxRealPoint, METH_VARARGS },
-	 { "new_wxRealPoint", _wrap_new_wxRealPoint, METH_VARARGS },
-	 { "wxRealPoint_y_get", _wrap_wxRealPoint_y_get, METH_VARARGS },
-	 { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, METH_VARARGS },
-	 { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, METH_VARARGS },
-	 { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, METH_VARARGS },
-	 { "wxSize_asTuple", _wrap_wxSize_asTuple, METH_VARARGS },
-	 { "wxSize_SetHeight", _wrap_wxSize_SetHeight, METH_VARARGS },
-	 { "wxSize_SetWidth", _wrap_wxSize_SetWidth, METH_VARARGS },
-	 { "wxSize_GetHeight", _wrap_wxSize_GetHeight, METH_VARARGS },
-	 { "wxSize_GetWidth", _wrap_wxSize_GetWidth, METH_VARARGS },
-	 { "wxSize_GetY", _wrap_wxSize_GetY, METH_VARARGS },
-	 { "wxSize_GetX", _wrap_wxSize_GetX, METH_VARARGS },
-	 { "wxSize_Set", _wrap_wxSize_Set, METH_VARARGS },
-	 { "delete_wxSize", _wrap_delete_wxSize, METH_VARARGS },
-	 { "new_wxSize", _wrap_new_wxSize, METH_VARARGS },
-	 { "wxSize_height_get", _wrap_wxSize_y_get, METH_VARARGS },
-	 { "wxSize_height_set", _wrap_wxSize_y_set, METH_VARARGS },
-	 { "wxSize_width_get", _wrap_wxSize_x_get, METH_VARARGS },
-	 { "wxSize_width_set", _wrap_wxSize_x_set, METH_VARARGS },
-	 { "wxSize_y_get", _wrap_wxSize_y_get, METH_VARARGS },
-	 { "wxSize_y_set", _wrap_wxSize_y_set, METH_VARARGS },
-	 { "wxSize_x_get", _wrap_wxSize_x_get, METH_VARARGS },
-	 { "wxSize_x_set", _wrap_wxSize_x_set, METH_VARARGS },
-	 { "wxSystemSettings_GetSystemMetric", _wrap_wxSystemSettings_GetSystemMetric, METH_VARARGS },
-	 { "wxSystemSettings_GetSystemFont", _wrap_wxSystemSettings_GetSystemFont, METH_VARARGS },
-	 { "wxSystemSettings_GetSystemColour", _wrap_wxSystemSettings_GetSystemColour, METH_VARARGS },
-	 { "wxResourceParseString", _wrap_wxResourceParseString, METH_VARARGS },
-	 { "wxResourceParseFile", _wrap_wxResourceParseFile, METH_VARARGS },
-	 { "wxResourceParseData", _wrap_wxResourceParseData, METH_VARARGS },
-	 { "wxResourceGetIdentifier", _wrap_wxResourceGetIdentifier, METH_VARARGS },
-	 { "wxResourceCreateMenuBar", _wrap_wxResourceCreateMenuBar, METH_VARARGS },
-	 { "wxResourceCreateIcon", _wrap_wxResourceCreateIcon, METH_VARARGS },
-	 { "wxResourceCreateBitmap", _wrap_wxResourceCreateBitmap, METH_VARARGS },
-	 { "wxResourceClear", _wrap_wxResourceClear, METH_VARARGS },
-	 { "wxResourceAddIdentifier", _wrap_wxResourceAddIdentifier, METH_VARARGS },
-	 { "wxGetResource", _wrap_wxGetResource, METH_VARARGS },
-	 { "wxEnableTopLevelWindows", _wrap_wxEnableTopLevelWindows, METH_VARARGS },
-	 { "wxSafeYield", _wrap_wxSafeYield, METH_VARARGS },
-	 { "wxYield", _wrap_wxYield, METH_VARARGS },
-	 { "wxSleep", _wrap_wxSleep, METH_VARARGS },
-	 { "wxGetOsVersion", _wrap_wxGetOsVersion, METH_VARARGS },
-	 { "wxStartTimer", _wrap_wxStartTimer, METH_VARARGS },
-	 { "wxShell", _wrap_wxShell, METH_VARARGS },
-	 { "wxNow", _wrap_wxNow, METH_VARARGS },
-	 { "wxIsBusy", _wrap_wxIsBusy, METH_VARARGS },
-	 { "wxGetMousePosition", _wrap_wxGetMousePosition, METH_VARARGS },
-	 { "wxGetFreeMemory", _wrap_wxGetFreeMemory, METH_VARARGS },
-	 { "wxGetElapsedTime", _wrap_wxGetElapsedTime, METH_VARARGS },
-	 { "wxGetActiveWindow", _wrap_wxGetActiveWindow, METH_VARARGS },
-	 { "wxExecute", _wrap_wxExecute, METH_VARARGS },
-	 { "wxEndBusyCursor", _wrap_wxEndBusyCursor, METH_VARARGS },
-	 { "wxDisplaySize", _wrap_wxDisplaySize, METH_VARARGS },
-	 { "wxBell", _wrap_wxBell, METH_VARARGS },
-	 { "wxBeginBusyCursor", _wrap_wxBeginBusyCursor, METH_VARARGS },
-	 { "RegisterId", _wrap_RegisterId, METH_VARARGS },
-	 { "NewId", _wrap_NewId, METH_VARARGS },
-	 { "wxRegisterId", _wrap_wxRegisterId, METH_VARARGS },
-	 { "wxNewId", _wrap_wxNewId, METH_VARARGS },
-	 { "wxSetCursor", _wrap_wxSetCursor, METH_VARARGS },
-	 { "wxDisplayDepth", _wrap_wxDisplayDepth, METH_VARARGS },
-	 { "wxColourDisplay", _wrap_wxColourDisplay, METH_VARARGS },
-	 { "wxGetNumberFromUser", _wrap_wxGetNumberFromUser, METH_VARARGS },
-	 { "wxMessageBox", _wrap_wxMessageBox, METH_VARARGS },
-	 { "wxGetSingleChoiceIndex", _wrap_wxGetSingleChoiceIndex, METH_VARARGS },
-	 { "wxGetSingleChoice", _wrap_wxGetSingleChoice, METH_VARARGS },
-	 { "wxGetTextFromUser", _wrap_wxGetTextFromUser, METH_VARARGS },
-	 { "wxFileSelector", _wrap_wxFileSelector, METH_VARARGS },
+	 { "new_wxAcceleratorTable", (PyCFunction) _wrap_new_wxAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxAcceleratorEntry_GetCommand", (PyCFunction) _wrap_wxAcceleratorEntry_GetCommand, METH_VARARGS | METH_KEYWORDS },
+	 { "wxAcceleratorEntry_GetKeyCode", (PyCFunction) _wrap_wxAcceleratorEntry_GetKeyCode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxAcceleratorEntry_GetFlags", (PyCFunction) _wrap_wxAcceleratorEntry_GetFlags, METH_VARARGS | METH_KEYWORDS },
+	 { "wxAcceleratorEntry_Set", (PyCFunction) _wrap_wxAcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxAcceleratorEntry", (PyCFunction) _wrap_new_wxAcceleratorEntry, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_Next", (PyCFunction) _wrap_wxRegionIterator_Next, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_Reset", (PyCFunction) _wrap_wxRegionIterator_Reset, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_HaveRects", (PyCFunction) _wrap_wxRegionIterator_HaveRects, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_GetRect", (PyCFunction) _wrap_wxRegionIterator_GetRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_GetHeight", (PyCFunction) _wrap_wxRegionIterator_GetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_GetH", (PyCFunction) _wrap_wxRegionIterator_GetH, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_GetWidth", (PyCFunction) _wrap_wxRegionIterator_GetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_GetW", (PyCFunction) _wrap_wxRegionIterator_GetW, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_GetY", (PyCFunction) _wrap_wxRegionIterator_GetY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegionIterator_GetX", (PyCFunction) _wrap_wxRegionIterator_GetX, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxRegionIterator", (PyCFunction) _wrap_delete_wxRegionIterator, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRegionIterator", (PyCFunction) _wrap_new_wxRegionIterator, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_Xor", (PyCFunction) _wrap_wxRegion_Xor, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_Union", (PyCFunction) _wrap_wxRegion_Union, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_Subtract", (PyCFunction) _wrap_wxRegion_Subtract, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_IsEmpty", (PyCFunction) _wrap_wxRegion_IsEmpty, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_Intersect", (PyCFunction) _wrap_wxRegion_Intersect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_GetBox", (PyCFunction) _wrap_wxRegion_GetBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_ContainsRect", (PyCFunction) _wrap_wxRegion_ContainsRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_ContainsPoint", (PyCFunction) _wrap_wxRegion_ContainsPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_Contains", (PyCFunction) _wrap_wxRegion_Contains, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegion_Clear", (PyCFunction) _wrap_wxRegion_Clear, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxRegion", (PyCFunction) _wrap_delete_wxRegion, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRegion", (PyCFunction) _wrap_new_wxRegion, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_width_get", (PyCFunction) _wrap_wxLayoutConstraints_width_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_top_get", (PyCFunction) _wrap_wxLayoutConstraints_top_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_right_get", (PyCFunction) _wrap_wxLayoutConstraints_right_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_left_get", (PyCFunction) _wrap_wxLayoutConstraints_left_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_height_get", (PyCFunction) _wrap_wxLayoutConstraints_height_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_centreY_get", (PyCFunction) _wrap_wxLayoutConstraints_centreY_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_centreX_get", (PyCFunction) _wrap_wxLayoutConstraints_centreX_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutConstraints_bottom_get", (PyCFunction) _wrap_wxLayoutConstraints_bottom_get, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxLayoutConstraints", (PyCFunction) _wrap_new_wxLayoutConstraints, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_Set", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_SameAs", (PyCFunction) _wrap_wxIndividualLayoutConstraint_SameAs, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_RightOf", (PyCFunction) _wrap_wxIndividualLayoutConstraint_RightOf, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_PercentOf", (PyCFunction) _wrap_wxIndividualLayoutConstraint_PercentOf, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_LeftOf", (PyCFunction) _wrap_wxIndividualLayoutConstraint_LeftOf, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_Unconstrained", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Unconstrained, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_Below", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Below, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_AsIs", (PyCFunction) _wrap_wxIndividualLayoutConstraint_AsIs, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_Absolute", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Absolute, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIndividualLayoutConstraint_Above", (PyCFunction) _wrap_wxIndividualLayoutConstraint_Above, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyTimer_Stop", (PyCFunction) _wrap_wxPyTimer_Stop, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyTimer_Start", (PyCFunction) _wrap_wxPyTimer_Start, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyTimer_Interval", (PyCFunction) _wrap_wxPyTimer_Interval, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPyTimer", (PyCFunction) _wrap_delete_wxPyTimer, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPyTimer", (PyCFunction) _wrap_new_wxPyTimer, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_asTuple", (PyCFunction) _wrap_wxRect_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_height_get", (PyCFunction) _wrap_wxRect_height_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_height_set", (PyCFunction) _wrap_wxRect_height_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_width_get", (PyCFunction) _wrap_wxRect_width_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_width_set", (PyCFunction) _wrap_wxRect_width_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_y_get", (PyCFunction) _wrap_wxRect_y_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_y_set", (PyCFunction) _wrap_wxRect_y_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_x_get", (PyCFunction) _wrap_wxRect_x_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_x_set", (PyCFunction) _wrap_wxRect_x_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetRight", (PyCFunction) _wrap_wxRect_GetRight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetBottom", (PyCFunction) _wrap_wxRect_GetBottom, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetTop", (PyCFunction) _wrap_wxRect_GetTop, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetLeft", (PyCFunction) _wrap_wxRect_GetLeft, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetSize", (PyCFunction) _wrap_wxRect_GetSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetPosition", (PyCFunction) _wrap_wxRect_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_SetHeight", (PyCFunction) _wrap_wxRect_SetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetHeight", (PyCFunction) _wrap_wxRect_GetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_SetWidth", (PyCFunction) _wrap_wxRect_SetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetWidth", (PyCFunction) _wrap_wxRect_GetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_SetY", (PyCFunction) _wrap_wxRect_SetY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetY", (PyCFunction) _wrap_wxRect_GetY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_SetX", (PyCFunction) _wrap_wxRect_SetX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRect_GetX", (PyCFunction) _wrap_wxRect_GetX, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxRect", (PyCFunction) _wrap_delete_wxRect, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRect", (PyCFunction) _wrap_new_wxRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPoint_asTuple", (PyCFunction) _wrap_wxPoint_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPoint_Set", (PyCFunction) _wrap_wxPoint_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPoint", (PyCFunction) _wrap_delete_wxPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPoint", (PyCFunction) _wrap_new_wxPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPoint_y_get", (PyCFunction) _wrap_wxPoint_y_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPoint_y_set", (PyCFunction) _wrap_wxPoint_y_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPoint_x_get", (PyCFunction) _wrap_wxPoint_x_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPoint_x_set", (PyCFunction) _wrap_wxPoint_x_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRealPoint_asTuple", (PyCFunction) _wrap_wxRealPoint_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRealPoint_Set", (PyCFunction) _wrap_wxRealPoint_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxRealPoint", (PyCFunction) _wrap_delete_wxRealPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxRealPoint", (PyCFunction) _wrap_new_wxRealPoint, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRealPoint_y_get", (PyCFunction) _wrap_wxRealPoint_y_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRealPoint_y_set", (PyCFunction) _wrap_wxRealPoint_y_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRealPoint_x_get", (PyCFunction) _wrap_wxRealPoint_x_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRealPoint_x_set", (PyCFunction) _wrap_wxRealPoint_x_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_asTuple", (PyCFunction) _wrap_wxSize_asTuple, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_SetHeight", (PyCFunction) _wrap_wxSize_SetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_SetWidth", (PyCFunction) _wrap_wxSize_SetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_GetHeight", (PyCFunction) _wrap_wxSize_GetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_GetWidth", (PyCFunction) _wrap_wxSize_GetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_GetY", (PyCFunction) _wrap_wxSize_GetY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_GetX", (PyCFunction) _wrap_wxSize_GetX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_Set", (PyCFunction) _wrap_wxSize_Set, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxSize", (PyCFunction) _wrap_delete_wxSize, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSize", (PyCFunction) _wrap_new_wxSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_height_get", (PyCFunction) _wrap_wxSize_y_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_height_set", (PyCFunction) _wrap_wxSize_y_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_width_get", (PyCFunction) _wrap_wxSize_x_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_width_set", (PyCFunction) _wrap_wxSize_x_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_y_get", (PyCFunction) _wrap_wxSize_y_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_y_set", (PyCFunction) _wrap_wxSize_y_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_x_get", (PyCFunction) _wrap_wxSize_x_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSize_x_set", (PyCFunction) _wrap_wxSize_x_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSystemSettings_GetSystemMetric", (PyCFunction) _wrap_wxSystemSettings_GetSystemMetric, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSystemSettings_GetSystemFont", (PyCFunction) _wrap_wxSystemSettings_GetSystemFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSystemSettings_GetSystemColour", (PyCFunction) _wrap_wxSystemSettings_GetSystemColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceParseString", (PyCFunction) _wrap_wxResourceParseString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceParseFile", (PyCFunction) _wrap_wxResourceParseFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceParseData", (PyCFunction) _wrap_wxResourceParseData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceGetIdentifier", (PyCFunction) _wrap_wxResourceGetIdentifier, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceCreateMenuBar", (PyCFunction) _wrap_wxResourceCreateMenuBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceCreateIcon", (PyCFunction) _wrap_wxResourceCreateIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceCreateBitmap", (PyCFunction) _wrap_wxResourceCreateBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceClear", (PyCFunction) _wrap_wxResourceClear, METH_VARARGS | METH_KEYWORDS },
+	 { "wxResourceAddIdentifier", (PyCFunction) _wrap_wxResourceAddIdentifier, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetResource", (PyCFunction) _wrap_wxGetResource, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEnableTopLevelWindows", (PyCFunction) _wrap_wxEnableTopLevelWindows, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSafeYield", (PyCFunction) _wrap_wxSafeYield, METH_VARARGS | METH_KEYWORDS },
+	 { "wxYield", (PyCFunction) _wrap_wxYield, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSleep", (PyCFunction) _wrap_wxSleep, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetOsVersion", (PyCFunction) _wrap_wxGetOsVersion, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStartTimer", (PyCFunction) _wrap_wxStartTimer, METH_VARARGS | METH_KEYWORDS },
+	 { "wxShell", (PyCFunction) _wrap_wxShell, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNow", (PyCFunction) _wrap_wxNow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxIsBusy", (PyCFunction) _wrap_wxIsBusy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetMousePosition", (PyCFunction) _wrap_wxGetMousePosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetFreeMemory", (PyCFunction) _wrap_wxGetFreeMemory, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetElapsedTime", (PyCFunction) _wrap_wxGetElapsedTime, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetActiveWindow", (PyCFunction) _wrap_wxGetActiveWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxExecute", (PyCFunction) _wrap_wxExecute, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEndBusyCursor", (PyCFunction) _wrap_wxEndBusyCursor, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDisplaySize", (PyCFunction) _wrap_wxDisplaySize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBell", (PyCFunction) _wrap_wxBell, METH_VARARGS | METH_KEYWORDS },
+	 { "wxBeginBusyCursor", (PyCFunction) _wrap_wxBeginBusyCursor, METH_VARARGS | METH_KEYWORDS },
+	 { "RegisterId", (PyCFunction) _wrap_RegisterId, METH_VARARGS | METH_KEYWORDS },
+	 { "NewId", (PyCFunction) _wrap_NewId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxRegisterId", (PyCFunction) _wrap_wxRegisterId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNewId", (PyCFunction) _wrap_wxNewId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSetCursor", (PyCFunction) _wrap_wxSetCursor, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDisplayDepth", (PyCFunction) _wrap_wxDisplayDepth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxColourDisplay", (PyCFunction) _wrap_wxColourDisplay, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetNumberFromUser", (PyCFunction) _wrap_wxGetNumberFromUser, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMessageBox", (PyCFunction) _wrap_wxMessageBox, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetSingleChoiceIndex", (PyCFunction) _wrap_wxGetSingleChoiceIndex, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetSingleChoice", (PyCFunction) _wrap_wxGetSingleChoice, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGetTextFromUser", (PyCFunction) _wrap_wxGetTextFromUser, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFileSelector", (PyCFunction) _wrap_wxFileSelector, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/misc.py b/utils/wxPython/src/msw/misc.py
index 7aa83f61a3..bdcb7de858 100644
--- a/utils/wxPython/src/msw/misc.py
+++ b/utils/wxPython/src/msw/misc.py
@@ -74,6 +74,12 @@ class wxRealPointPtr :
     def __del__(self,miscc=miscc):
         if self.thisown == 1 :
             miscc.delete_wxRealPoint(self)
+    def Set(self, *_args, **_kwargs):
+        val = apply(miscc.wxRealPoint_Set,(self,) + _args, _kwargs)
+        return val
+    def asTuple(self, *_args, **_kwargs):
+        val = apply(miscc.wxRealPoint_asTuple,(self,) + _args, _kwargs)
+        return val
     def __setattr__(self,name,value):
         if name == "x" :
             miscc.wxRealPoint_x_set(self,value)
@@ -90,6 +96,8 @@ class wxRealPointPtr :
         raise AttributeError,name
     def __repr__(self):
         return "<C wxRealPoint instance at %s>" % (self.this,)
+    def __str__(self): return str(self.asTuple())
+    def __repr__(self): return str(self.asTuple())
 class wxRealPoint(wxRealPointPtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(miscc.new_wxRealPoint,_args,_kwargs)
diff --git a/utils/wxPython/src/msw/misc2.cpp b/utils/wxPython/src/msw/misc2.cpp
index 7812aef78a..f815ff1b5f 100644
--- a/utils/wxPython/src/msw/misc2.cpp
+++ b/utils/wxPython/src/msw/misc2.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -127,17 +127,18 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxString * _arg0;
     wxWindow * _arg1 = (wxWindow *) NULL;
     PyObject * _obj0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "label","parent", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:wxFindWindowByLabel",&_obj0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFindWindowByLabel",_kwnames,&_obj0,&_argo1)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -172,17 +173,18 @@ static PyObject *_wrap_wxFindWindowByLabel(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxString * _arg0;
     wxWindow * _arg1 = (wxWindow *) NULL;
     PyObject * _obj0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "name","parent", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:wxFindWindowByName",&_obj0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFindWindowByName",_kwnames,&_obj0,&_argo1)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -217,13 +219,14 @@ static PyObject *_wrap_wxFindWindowByName(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxToolTip_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolTip_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _arg0;
     int tempbool0;
+    char *_kwnames[] = { "flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"i:wxToolTip_Enable",&tempbool0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"i:wxToolTip_Enable",_kwnames,&tempbool0)) 
         return NULL;
     _arg0 = (bool ) tempbool0;
 {
@@ -236,12 +239,13 @@ static PyObject *_wrap_wxToolTip_Enable(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxToolTip_SetDelay(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolTip_SetDelay(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _arg0;
+    char *_kwnames[] = { "milliseconds", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"l:wxToolTip_SetDelay",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxToolTip_SetDelay",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -254,15 +258,16 @@ static PyObject *_wrap_wxToolTip_SetDelay(PyObject *self, PyObject *args) {
 }
 
 #define new_wxToolTip(_swigarg0) (new wxToolTip(_swigarg0))
-static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolTip * _result;
     wxString * _arg0;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "tip", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:new_wxToolTip",&_obj0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:new_wxToolTip",_kwnames,&_obj0)) 
         return NULL;
 {
     if (!PyString_Check(_obj0)) {
@@ -291,15 +296,16 @@ static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args) {
 }
 
 #define wxToolTip_SetTip(_swigobj,_swigarg0)  (_swigobj->SetTip(_swigarg0))
-static PyObject *_wrap_wxToolTip_SetTip(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolTip_SetTip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolTip * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","tip", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolTip_SetTip",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolTip_SetTip",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -330,14 +336,15 @@ static PyObject *_wrap_wxToolTip_SetTip(PyObject *self, PyObject *args) {
 }
 
 #define wxToolTip_GetTip(_swigobj)  (_swigobj->GetTip())
-static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolTip * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolTip_GetTip",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolTip_GetTip",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -361,15 +368,16 @@ static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args) {
 }
 
 #define wxToolTip_GetWindow(_swigobj)  (_swigobj->GetWindow())
-static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxToolTip * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolTip_GetWindow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolTip_GetWindow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -394,14 +402,14 @@ static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef misc2cMethods[] = {
-	 { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, METH_VARARGS },
-	 { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, METH_VARARGS },
-	 { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, METH_VARARGS },
-	 { "new_wxToolTip", _wrap_new_wxToolTip, METH_VARARGS },
-	 { "wxToolTip_SetDelay", _wrap_wxToolTip_SetDelay, METH_VARARGS },
-	 { "wxToolTip_Enable", _wrap_wxToolTip_Enable, METH_VARARGS },
-	 { "wxFindWindowByName", _wrap_wxFindWindowByName, METH_VARARGS },
-	 { "wxFindWindowByLabel", _wrap_wxFindWindowByLabel, METH_VARARGS },
+	 { "wxToolTip_GetWindow", (PyCFunction) _wrap_wxToolTip_GetWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolTip_SetDelay", (PyCFunction) _wrap_wxToolTip_SetDelay, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolTip_Enable", (PyCFunction) _wrap_wxToolTip_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFindWindowByName", (PyCFunction) _wrap_wxFindWindowByName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxFindWindowByLabel", (PyCFunction) _wrap_wxFindWindowByLabel, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/printfw.cpp b/utils/wxPython/src/msw/printfw.cpp
index f363d2bb11..6f6a947122 100644
--- a/utils/wxPython/src/msw/printfw.cpp
+++ b/utils/wxPython/src/msw/printfw.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 802)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -180,13 +180,14 @@ public:
 extern "C" {
 #endif
 #define new_wxPrintData() (new wxPrintData())
-static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxPrintData")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPrintData",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -204,13 +205,14 @@ static PyObject *_wrap_new_wxPrintData(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxPrintData(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPrintData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPrintData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPrintData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -230,14 +232,15 @@ static PyObject *_wrap_delete_wxPrintData(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_GetNoCopies(_swigobj)  (_swigobj->GetNoCopies())
-static PyObject *_wrap_wxPrintData_GetNoCopies(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetNoCopies",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetNoCopies",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -256,14 +259,15 @@ static PyObject *_wrap_wxPrintData_GetNoCopies(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_GetCollate(_swigobj)  (_swigobj->GetCollate())
-static PyObject *_wrap_wxPrintData_GetCollate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetCollate",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetCollate",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -282,14 +286,15 @@ static PyObject *_wrap_wxPrintData_GetCollate(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_GetOrientation(_swigobj)  (_swigobj->GetOrientation())
-static PyObject *_wrap_wxPrintData_GetOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetOrientation",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetOrientation",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -308,14 +313,15 @@ static PyObject *_wrap_wxPrintData_GetOrientation(PyObject *self, PyObject *args
 }
 
 #define wxPrintData_GetPrinterName(_swigobj)  (_swigobj->GetPrinterName())
-static PyObject *_wrap_wxPrintData_GetPrinterName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetPrinterName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetPrinterName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPrinterName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -337,14 +343,15 @@ static PyObject *_wrap_wxPrintData_GetPrinterName(PyObject *self, PyObject *args
 }
 
 #define wxPrintData_GetColour(_swigobj)  (_swigobj->GetColour())
-static PyObject *_wrap_wxPrintData_GetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -363,14 +370,15 @@ static PyObject *_wrap_wxPrintData_GetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_GetDuplex(_swigobj)  (_swigobj->GetDuplex())
-static PyObject *_wrap_wxPrintData_GetDuplex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetDuplex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDuplexMode  _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetDuplex",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetDuplex",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -389,14 +397,15 @@ static PyObject *_wrap_wxPrintData_GetDuplex(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_GetPaperId(_swigobj)  (_swigobj->GetPaperId())
-static PyObject *_wrap_wxPrintData_GetPaperId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPaperSize  _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetPaperId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPaperId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -415,15 +424,16 @@ static PyObject *_wrap_wxPrintData_GetPaperId(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_GetPaperSize(_swigobj)  (_swigobj->GetPaperSize())
-static PyObject *_wrap_wxPrintData_GetPaperSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetPaperSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetPaperSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -449,14 +459,15 @@ static PyObject *_wrap_wxPrintData_GetPaperSize(PyObject *self, PyObject *args)
 }
 
 #define wxPrintData_GetQuality(_swigobj)  (_swigobj->GetQuality())
-static PyObject *_wrap_wxPrintData_GetQuality(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_GetQuality(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintQuality  _result;
     wxPrintData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintData_GetQuality",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintData_GetQuality",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -475,14 +486,15 @@ static PyObject *_wrap_wxPrintData_GetQuality(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_SetNoCopies(_swigobj,_swigarg0)  (_swigobj->SetNoCopies(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetNoCopies(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","v", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetNoCopies",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetNoCopies",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -502,15 +514,16 @@ static PyObject *_wrap_wxPrintData_SetNoCopies(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_SetCollate(_swigobj,_swigarg0)  (_swigobj->SetCollate(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetCollate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetCollate",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetCollate",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -531,14 +544,15 @@ static PyObject *_wrap_wxPrintData_SetCollate(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_SetOrientation(_swigobj,_swigarg0)  (_swigobj->SetOrientation(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orient", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetOrientation",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetOrientation",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -558,15 +572,16 @@ static PyObject *_wrap_wxPrintData_SetOrientation(PyObject *self, PyObject *args
 }
 
 #define wxPrintData_SetPrinterName(_swigobj,_swigarg0)  (_swigobj->SetPrinterName(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetPrinterName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetPrinterName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrintData_SetPrinterName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPrinterName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -597,15 +612,16 @@ static PyObject *_wrap_wxPrintData_SetPrinterName(PyObject *self, PyObject *args
 }
 
 #define wxPrintData_SetColour(_swigobj,_swigarg0)  (_swigobj->SetColour(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetColour",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetColour",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -626,14 +642,15 @@ static PyObject *_wrap_wxPrintData_SetColour(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_SetDuplex(_swigobj,_swigarg0)  (_swigobj->SetDuplex(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetDuplex(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetDuplex(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxDuplexMode  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","duplex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetDuplex",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetDuplex",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -653,14 +670,15 @@ static PyObject *_wrap_wxPrintData_SetDuplex(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_SetPaperId(_swigobj,_swigarg0)  (_swigobj->SetPaperId(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetPaperId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxPaperSize  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","sizeId", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetPaperId",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetPaperId",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -680,15 +698,16 @@ static PyObject *_wrap_wxPrintData_SetPaperId(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintData_SetPaperSize(_swigobj,_swigarg0)  (_swigobj->SetPaperSize(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetPaperSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","sz", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrintData_SetPaperSize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintData_SetPaperSize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -715,14 +734,15 @@ static PyObject *_wrap_wxPrintData_SetPaperSize(PyObject *self, PyObject *args)
 }
 
 #define wxPrintData_SetQuality(_swigobj,_swigarg0)  (_swigobj->SetQuality(_swigarg0))
-static PyObject *_wrap_wxPrintData_SetQuality(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintData_SetQuality(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _arg0;
     wxPrintQuality  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","quality", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintData_SetQuality",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintData_SetQuality",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -742,13 +762,14 @@ static PyObject *_wrap_wxPrintData_SetQuality(PyObject *self, PyObject *args) {
 }
 
 #define new_wxPageSetupDialogData() (new wxPageSetupDialogData())
-static PyObject *_wrap_new_wxPageSetupDialogData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPageSetupDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxPageSetupDialogData")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPageSetupDialogData",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -766,13 +787,14 @@ static PyObject *_wrap_new_wxPageSetupDialogData(PyObject *self, PyObject *args)
 }
 
 #define delete_wxPageSetupDialogData(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPageSetupDialogData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPageSetupDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPageSetupDialogData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPageSetupDialogData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -792,15 +814,16 @@ static PyObject *_wrap_delete_wxPageSetupDialogData(PyObject *self, PyObject *ar
 }
 
 #define wxPageSetupDialogData_EnableHelp(_swigobj,_swigarg0)  (_swigobj->EnableHelp(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_EnableHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_EnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnableHelp",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPageSetupDialogData_EnableHelp",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -821,15 +844,16 @@ static PyObject *_wrap_wxPageSetupDialogData_EnableHelp(PyObject *self, PyObject
 }
 
 #define wxPageSetupDialogData_EnableMargins(_swigobj,_swigarg0)  (_swigobj->EnableMargins(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_EnableMargins(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_EnableMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnableMargins",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPageSetupDialogData_EnableMargins",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -850,15 +874,16 @@ static PyObject *_wrap_wxPageSetupDialogData_EnableMargins(PyObject *self, PyObj
 }
 
 #define wxPageSetupDialogData_EnableOrientation(_swigobj,_swigarg0)  (_swigobj->EnableOrientation(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_EnableOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_EnableOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnableOrientation",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPageSetupDialogData_EnableOrientation",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -879,15 +904,16 @@ static PyObject *_wrap_wxPageSetupDialogData_EnableOrientation(PyObject *self, P
 }
 
 #define wxPageSetupDialogData_EnablePaper(_swigobj,_swigarg0)  (_swigobj->EnablePaper(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_EnablePaper(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_EnablePaper(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnablePaper",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPageSetupDialogData_EnablePaper",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -908,15 +934,16 @@ static PyObject *_wrap_wxPageSetupDialogData_EnablePaper(PyObject *self, PyObjec
 }
 
 #define wxPageSetupDialogData_EnablePrinter(_swigobj,_swigarg0)  (_swigobj->EnablePrinter(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_EnablePrinter(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_EnablePrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_EnablePrinter",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPageSetupDialogData_EnablePrinter",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -937,14 +964,15 @@ static PyObject *_wrap_wxPageSetupDialogData_EnablePrinter(PyObject *self, PyObj
 }
 
 #define wxPageSetupDialogData_GetDefaultMinMargins(_swigobj)  (_swigobj->GetDefaultMinMargins())
-static PyObject *_wrap_wxPageSetupDialogData_GetDefaultMinMargins(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetDefaultMinMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetDefaultMinMargins",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetDefaultMinMargins",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -963,14 +991,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetDefaultMinMargins(PyObject *self
 }
 
 #define wxPageSetupDialogData_GetEnableMargins(_swigobj)  (_swigobj->GetEnableMargins())
-static PyObject *_wrap_wxPageSetupDialogData_GetEnableMargins(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetEnableMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnableMargins",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetEnableMargins",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -989,14 +1018,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnableMargins(PyObject *self, Py
 }
 
 #define wxPageSetupDialogData_GetEnableOrientation(_swigobj)  (_swigobj->GetEnableOrientation())
-static PyObject *_wrap_wxPageSetupDialogData_GetEnableOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetEnableOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnableOrientation",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetEnableOrientation",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1015,14 +1045,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnableOrientation(PyObject *self
 }
 
 #define wxPageSetupDialogData_GetEnablePaper(_swigobj)  (_swigobj->GetEnablePaper())
-static PyObject *_wrap_wxPageSetupDialogData_GetEnablePaper(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetEnablePaper(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnablePaper",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetEnablePaper",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1041,14 +1072,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnablePaper(PyObject *self, PyOb
 }
 
 #define wxPageSetupDialogData_GetEnablePrinter(_swigobj)  (_swigobj->GetEnablePrinter())
-static PyObject *_wrap_wxPageSetupDialogData_GetEnablePrinter(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetEnablePrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnablePrinter",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetEnablePrinter",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1067,14 +1099,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnablePrinter(PyObject *self, Py
 }
 
 #define wxPageSetupDialogData_GetEnableHelp(_swigobj)  (_swigobj->GetEnableHelp())
-static PyObject *_wrap_wxPageSetupDialogData_GetEnableHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetEnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetEnableHelp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetEnableHelp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1093,14 +1126,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetEnableHelp(PyObject *self, PyObj
 }
 
 #define wxPageSetupDialogData_GetDefaultInfo(_swigobj)  (_swigobj->GetDefaultInfo())
-static PyObject *_wrap_wxPageSetupDialogData_GetDefaultInfo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetDefaultInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetDefaultInfo",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetDefaultInfo",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1119,15 +1153,16 @@ static PyObject *_wrap_wxPageSetupDialogData_GetDefaultInfo(PyObject *self, PyOb
 }
 
 #define wxPageSetupDialogData_GetMarginTopLeft(_swigobj)  (_swigobj->GetMarginTopLeft())
-static PyObject *_wrap_wxPageSetupDialogData_GetMarginTopLeft(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMarginTopLeft",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetMarginTopLeft",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1147,15 +1182,16 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMarginTopLeft(PyObject *self, Py
 }
 
 #define wxPageSetupDialogData_GetMarginBottomRight(_swigobj)  (_swigobj->GetMarginBottomRight())
-static PyObject *_wrap_wxPageSetupDialogData_GetMarginBottomRight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMarginBottomRight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetMarginBottomRight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1175,15 +1211,16 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMarginBottomRight(PyObject *self
 }
 
 #define wxPageSetupDialogData_GetMinMarginTopLeft(_swigobj)  (_swigobj->GetMinMarginTopLeft())
-static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginTopLeft(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMinMarginTopLeft",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetMinMarginTopLeft",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1203,15 +1240,16 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginTopLeft(PyObject *self,
 }
 
 #define wxPageSetupDialogData_GetMinMarginBottomRight(_swigobj)  (_swigobj->GetMinMarginBottomRight())
-static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginBottomRight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetMinMarginBottomRight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetMinMarginBottomRight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1231,14 +1269,15 @@ static PyObject *_wrap_wxPageSetupDialogData_GetMinMarginBottomRight(PyObject *s
 }
 
 #define wxPageSetupDialogData_GetPaperId(_swigobj)  (_swigobj->GetPaperId())
-static PyObject *_wrap_wxPageSetupDialogData_GetPaperId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPaperSize  _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetPaperId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetPaperId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1257,15 +1296,16 @@ static PyObject *_wrap_wxPageSetupDialogData_GetPaperId(PyObject *self, PyObject
 }
 
 #define wxPageSetupDialogData_GetPaperSize(_swigobj)  (_swigobj->GetPaperSize())
-static PyObject *_wrap_wxPageSetupDialogData_GetPaperSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetPaperSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetPaperSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1287,15 +1327,16 @@ static PyObject *_wrap_wxPageSetupDialogData_GetPaperSize(PyObject *self, PyObje
 static wxPrintData * wxPageSetupDialogData_GetPrintData(wxPageSetupDialogData *self) {
             return new wxPrintData(self->GetPrintData());  // force a copy
         }
-static PyObject *_wrap_wxPageSetupDialogData_GetPrintData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _result;
     wxPageSetupDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialogData_GetPrintData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialogData_GetPrintData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1320,15 +1361,16 @@ static PyObject *_wrap_wxPageSetupDialogData_GetPrintData(PyObject *self, PyObje
 }
 
 #define wxPageSetupDialogData_SetDefaultInfo(_swigobj,_swigarg0)  (_swigobj->SetDefaultInfo(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetDefaultInfo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetDefaultInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_SetDefaultInfo",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPageSetupDialogData_SetDefaultInfo",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1349,15 +1391,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetDefaultInfo(PyObject *self, PyOb
 }
 
 #define wxPageSetupDialogData_SetDefaultMinMargins(_swigobj,_swigarg0)  (_swigobj->SetDefaultMinMargins(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetDefaultMinMargins(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetDefaultMinMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPageSetupDialogData_SetDefaultMinMargins",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPageSetupDialogData_SetDefaultMinMargins",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1378,15 +1421,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetDefaultMinMargins(PyObject *self
 }
 
 #define wxPageSetupDialogData_SetMarginTopLeft(_swigobj,_swigarg0)  (_swigobj->SetMarginTopLeft(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetMarginTopLeft(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMarginTopLeft",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMarginTopLeft",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1413,15 +1457,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginTopLeft(PyObject *self, Py
 }
 
 #define wxPageSetupDialogData_SetMarginBottomRight(_swigobj,_swigarg0)  (_swigobj->SetMarginBottomRight(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetMarginBottomRight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMarginBottomRight",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMarginBottomRight",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1448,15 +1493,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMarginBottomRight(PyObject *self
 }
 
 #define wxPageSetupDialogData_SetMinMarginTopLeft(_swigobj,_swigarg0)  (_swigobj->SetMinMarginTopLeft(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginTopLeft(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginTopLeft(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMinMarginTopLeft",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMinMarginTopLeft",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1483,15 +1529,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginTopLeft(PyObject *self,
 }
 
 #define wxPageSetupDialogData_SetMinMarginBottomRight(_swigobj,_swigarg0)  (_swigobj->SetMinMarginBottomRight(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginBottomRight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginBottomRight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetMinMarginBottomRight",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetMinMarginBottomRight",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1518,15 +1565,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetMinMarginBottomRight(PyObject *s
 }
 
 #define wxPageSetupDialogData_SetPaperId(_swigobj,_swigarg0)  (_swigobj->SetPaperId(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetPaperId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetPaperId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPaperSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetPaperId",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetPaperId",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1553,15 +1601,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetPaperId(PyObject *self, PyObject
 }
 
 #define wxPageSetupDialogData_SetPaperSize(_swigobj,_swigarg0)  (_swigobj->SetPaperSize(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetPaperSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetPaperSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetPaperSize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetPaperSize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1588,15 +1637,16 @@ static PyObject *_wrap_wxPageSetupDialogData_SetPaperSize(PyObject *self, PyObje
 }
 
 #define wxPageSetupDialogData_SetPrintData(_swigobj,_swigarg0)  (_swigobj->SetPrintData(_swigarg0))
-static PyObject *_wrap_wxPageSetupDialogData_SetPrintData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialogData_SetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _arg0;
     wxPrintData * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","printData", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPageSetupDialogData_SetPrintData",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPageSetupDialogData_SetPrintData",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1655,17 +1705,18 @@ static void *SwigwxPageSetupDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxPageSetupDialog(_swigarg0,_swigarg1) (new wxPageSetupDialog(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxPageSetupDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPageSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialog * _result;
     wxWindow * _arg0;
     wxPageSetupDialogData * _arg1 = (wxPageSetupDialogData *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:new_wxPageSetupDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxPageSetupDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1697,15 +1748,16 @@ static PyObject *_wrap_new_wxPageSetupDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxPageSetupDialog_GetPageSetupData(_swigobj)  (_swigobj->GetPageSetupData())
-static PyObject *_wrap_wxPageSetupDialog_GetPageSetupData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialog_GetPageSetupData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPageSetupDialogData * _result;
     wxPageSetupDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialog_GetPageSetupData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialog_GetPageSetupData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1731,14 +1783,15 @@ static PyObject *_wrap_wxPageSetupDialog_GetPageSetupData(PyObject *self, PyObje
 }
 
 #define wxPageSetupDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxPageSetupDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPageSetupDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPageSetupDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPageSetupDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPageSetupDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1757,13 +1810,14 @@ static PyObject *_wrap_wxPageSetupDialog_ShowModal(PyObject *self, PyObject *arg
 }
 
 #define new_wxPrintDialogData() (new wxPrintDialogData())
-static PyObject *_wrap_new_wxPrintDialogData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxPrintDialogData")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPrintDialogData",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1781,13 +1835,14 @@ static PyObject *_wrap_new_wxPrintDialogData(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxPrintDialogData(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPrintDialogData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPrintDialogData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPrintDialogData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1807,15 +1862,16 @@ static PyObject *_wrap_delete_wxPrintDialogData(PyObject *self, PyObject *args)
 }
 
 #define wxPrintDialogData_EnableHelp(_swigobj,_swigarg0)  (_swigobj->EnableHelp(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_EnableHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_EnableHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnableHelp",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnableHelp",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1836,15 +1892,16 @@ static PyObject *_wrap_wxPrintDialogData_EnableHelp(PyObject *self, PyObject *ar
 }
 
 #define wxPrintDialogData_EnablePageNumbers(_swigobj,_swigarg0)  (_swigobj->EnablePageNumbers(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_EnablePageNumbers(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_EnablePageNumbers(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnablePageNumbers",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnablePageNumbers",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1865,15 +1922,16 @@ static PyObject *_wrap_wxPrintDialogData_EnablePageNumbers(PyObject *self, PyObj
 }
 
 #define wxPrintDialogData_EnablePrintToFile(_swigobj,_swigarg0)  (_swigobj->EnablePrintToFile(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_EnablePrintToFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_EnablePrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnablePrintToFile",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnablePrintToFile",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1894,15 +1952,16 @@ static PyObject *_wrap_wxPrintDialogData_EnablePrintToFile(PyObject *self, PyObj
 }
 
 #define wxPrintDialogData_EnableSelection(_swigobj,_swigarg0)  (_swigobj->EnableSelection(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_EnableSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_EnableSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_EnableSelection",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_EnableSelection",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1923,14 +1982,15 @@ static PyObject *_wrap_wxPrintDialogData_EnableSelection(PyObject *self, PyObjec
 }
 
 #define wxPrintDialogData_GetAllPages(_swigobj)  (_swigobj->GetAllPages())
-static PyObject *_wrap_wxPrintDialogData_GetAllPages(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetAllPages(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetAllPages",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetAllPages",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1949,14 +2009,15 @@ static PyObject *_wrap_wxPrintDialogData_GetAllPages(PyObject *self, PyObject *a
 }
 
 #define wxPrintDialogData_GetCollate(_swigobj)  (_swigobj->GetCollate())
-static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetCollate",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetCollate",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1975,14 +2036,15 @@ static PyObject *_wrap_wxPrintDialogData_GetCollate(PyObject *self, PyObject *ar
 }
 
 #define wxPrintDialogData_GetFromPage(_swigobj)  (_swigobj->GetFromPage())
-static PyObject *_wrap_wxPrintDialogData_GetFromPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetFromPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetFromPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2001,14 +2063,15 @@ static PyObject *_wrap_wxPrintDialogData_GetFromPage(PyObject *self, PyObject *a
 }
 
 #define wxPrintDialogData_GetMaxPage(_swigobj)  (_swigobj->GetMaxPage())
-static PyObject *_wrap_wxPrintDialogData_GetMaxPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetMaxPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetMaxPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2027,14 +2090,15 @@ static PyObject *_wrap_wxPrintDialogData_GetMaxPage(PyObject *self, PyObject *ar
 }
 
 #define wxPrintDialogData_GetMinPage(_swigobj)  (_swigobj->GetMinPage())
-static PyObject *_wrap_wxPrintDialogData_GetMinPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetMinPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetMinPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2053,14 +2117,15 @@ static PyObject *_wrap_wxPrintDialogData_GetMinPage(PyObject *self, PyObject *ar
 }
 
 #define wxPrintDialogData_GetNoCopies(_swigobj)  (_swigobj->GetNoCopies())
-static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetNoCopies",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetNoCopies",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2081,15 +2146,16 @@ static PyObject *_wrap_wxPrintDialogData_GetNoCopies(PyObject *self, PyObject *a
 static wxPrintData * wxPrintDialogData_GetPrintData(wxPrintDialogData *self) {
             return new wxPrintData(self->GetPrintData());  // force a copy
         }
-static PyObject *_wrap_wxPrintDialogData_GetPrintData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintData * _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetPrintData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetPrintData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2114,14 +2180,15 @@ static PyObject *_wrap_wxPrintDialogData_GetPrintData(PyObject *self, PyObject *
 }
 
 #define wxPrintDialogData_GetPrintToFile(_swigobj)  (_swigobj->GetPrintToFile())
-static PyObject *_wrap_wxPrintDialogData_GetPrintToFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetPrintToFile",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetPrintToFile",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2140,14 +2207,15 @@ static PyObject *_wrap_wxPrintDialogData_GetPrintToFile(PyObject *self, PyObject
 }
 
 #define wxPrintDialogData_GetToPage(_swigobj)  (_swigobj->GetToPage())
-static PyObject *_wrap_wxPrintDialogData_GetToPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_GetToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintDialogData * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialogData_GetToPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialogData_GetToPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2166,15 +2234,16 @@ static PyObject *_wrap_wxPrintDialogData_GetToPage(PyObject *self, PyObject *arg
 }
 
 #define wxPrintDialogData_SetCollate(_swigobj,_swigarg0)  (_swigobj->SetCollate(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetCollate",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetCollate",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2195,14 +2264,15 @@ static PyObject *_wrap_wxPrintDialogData_SetCollate(PyObject *self, PyObject *ar
 }
 
 #define wxPrintDialogData_SetFromPage(_swigobj,_swigarg0)  (_swigobj->SetFromPage(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","page", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetFromPage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetFromPage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2222,14 +2292,15 @@ static PyObject *_wrap_wxPrintDialogData_SetFromPage(PyObject *self, PyObject *a
 }
 
 #define wxPrintDialogData_SetMaxPage(_swigobj,_swigarg0)  (_swigobj->SetMaxPage(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetMaxPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","page", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetMaxPage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetMaxPage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2249,14 +2320,15 @@ static PyObject *_wrap_wxPrintDialogData_SetMaxPage(PyObject *self, PyObject *ar
 }
 
 #define wxPrintDialogData_SetMinPage(_swigobj,_swigarg0)  (_swigobj->SetMinPage(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetMinPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","page", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetMinPage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetMinPage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2276,14 +2348,15 @@ static PyObject *_wrap_wxPrintDialogData_SetMinPage(PyObject *self, PyObject *ar
 }
 
 #define wxPrintDialogData_SetNoCopies(_swigobj,_swigarg0)  (_swigobj->SetNoCopies(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetNoCopies(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetNoCopies(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","n", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetNoCopies",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetNoCopies",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2303,15 +2376,16 @@ static PyObject *_wrap_wxPrintDialogData_SetNoCopies(PyObject *self, PyObject *a
 }
 
 #define wxPrintDialogData_SetPrintData(_swigobj,_swigarg0)  (_swigobj->SetPrintData(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetPrintData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetPrintData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     wxPrintData * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","printData", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrintDialogData_SetPrintData",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintDialogData_SetPrintData",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2338,15 +2412,16 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintData(PyObject *self, PyObject *
 }
 
 #define wxPrintDialogData_SetPrintToFile(_swigobj,_swigarg0)  (_swigobj->SetPrintToFile(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetPrintToFile",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetPrintToFile",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2367,15 +2442,16 @@ static PyObject *_wrap_wxPrintDialogData_SetPrintToFile(PyObject *self, PyObject
 }
 
 #define wxPrintDialogData_SetSetupDialog(_swigobj,_swigarg0)  (_swigobj->SetSetupDialog(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetSetupDialog",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetSetupDialog",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2396,14 +2472,15 @@ static PyObject *_wrap_wxPrintDialogData_SetSetupDialog(PyObject *self, PyObject
 }
 
 #define wxPrintDialogData_SetToPage(_swigobj,_swigarg0)  (_swigobj->SetToPage(_swigarg0))
-static PyObject *_wrap_wxPrintDialogData_SetToPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialogData_SetToPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","page", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintDialogData_SetToPage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintDialogData_SetToPage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2455,17 +2532,18 @@ static void *SwigwxPrintDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxPrintDialog(_swigarg0,_swigarg1) (new wxPrintDialog(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialog * _result;
     wxWindow * _arg0;
     wxPrintDialogData * _arg1 = (wxPrintDialogData *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "parent","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:new_wxPrintDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:new_wxPrintDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2497,15 +2575,16 @@ static PyObject *_wrap_new_wxPrintDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintDialog_GetPrintDialogData(_swigobj)  (_swigobj->GetPrintDialogData())
-static PyObject *_wrap_wxPrintDialog_GetPrintDialogData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialog_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrintDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialog_GetPrintDialogData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_GetPrintDialogData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2531,15 +2610,16 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDialogData(PyObject *self, PyObject
 }
 
 #define wxPrintDialog_GetPrintDC(_swigobj)  (_swigobj->GetPrintDC())
-static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDC * _result;
     wxPrintDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialog_GetPrintDC",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_GetPrintDC",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2564,14 +2644,15 @@ static PyObject *_wrap_wxPrintDialog_GetPrintDC(PyObject *self, PyObject *args)
 }
 
 #define wxPrintDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2590,14 +2671,15 @@ static PyObject *_wrap_wxPrintDialog_ShowModal(PyObject *self, PyObject *args) {
 }
 
 #define new_wxPrintout(_swigarg0) (new wxPyPrintout(_swigarg0))
-static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _result;
     char * _arg0 = (char *) "Printout";
+    char *_kwnames[] = { "title", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|s:new_wxPrintout",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|s:new_wxPrintout",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -2615,15 +2697,16 @@ static PyObject *_wrap_new_wxPrintout(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintout__setSelf(_swigobj,_swigarg0)  (_swigobj->_setSelf(_swigarg0))
-static PyObject *_wrap_wxPrintout__setSelf(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout__setSelf(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrintout__setSelf",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintout__setSelf",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2645,16 +2728,15 @@ static PyObject *_wrap_wxPrintout__setSelf(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static void  wxPyPrintout_Destroy(wxPyPrintout *self) {
-            delete self;
-        }
-static PyObject *_wrap_wxPrintout_Destroy(PyObject *self, PyObject *args) {
+static void  wxPyPrintout_Destroy(wxPyPrintout *self) { delete self; }
+static PyObject *_wrap_wxPrintout_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_Destroy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_Destroy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2674,15 +2756,16 @@ static PyObject *_wrap_wxPrintout_Destroy(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintout_GetDC(_swigobj)  (_swigobj->GetDC())
-static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDC * _result;
     wxPyPrintout * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetDC",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetDC",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2707,7 +2790,7 @@ static PyObject *_wrap_wxPrintout_GetDC(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintout_GetPageSizeMM(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPageSizeMM(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     int * _arg1;
@@ -2715,6 +2798,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args)
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -2723,7 +2807,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args)
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPageSizeMM",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPageSizeMM",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2753,7 +2837,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizeMM(PyObject *self, PyObject *args)
 }
 
 #define wxPrintout_GetPageSizePixels(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPageSizePixels(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     int * _arg1;
@@ -2761,6 +2845,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *ar
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -2769,7 +2854,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *ar
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPageSizePixels",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPageSizePixels",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2799,7 +2884,7 @@ static PyObject *_wrap_wxPrintout_GetPageSizePixels(PyObject *self, PyObject *ar
 }
 
 #define wxPrintout_GetPPIPrinter(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPPIPrinter(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     int * _arg1;
@@ -2807,6 +2892,7 @@ static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args)
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -2815,7 +2901,7 @@ static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args)
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPPIPrinter",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPPIPrinter",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2845,7 +2931,7 @@ static PyObject *_wrap_wxPrintout_GetPPIPrinter(PyObject *self, PyObject *args)
 }
 
 #define wxPrintout_GetPPIScreen(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPPIScreen(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     int * _arg1;
@@ -2853,6 +2939,7 @@ static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args) {
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -2861,7 +2948,7 @@ static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_GetPPIScreen",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_GetPPIScreen",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2891,14 +2978,15 @@ static PyObject *_wrap_wxPrintout_GetPPIScreen(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintout_IsPreview(_swigobj)  (_swigobj->IsPreview())
-static PyObject *_wrap_wxPrintout_IsPreview(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_IsPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyPrintout * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_IsPreview",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_IsPreview",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2917,16 +3005,17 @@ static PyObject *_wrap_wxPrintout_IsPreview(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintout_base_OnBeginDocument(_swigobj,_swigarg0,_swigarg1)  (_swigobj->base_OnBeginDocument(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPrintout_base_OnBeginDocument(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_base_OnBeginDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyPrintout * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","startPage","endPage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxPrintout_base_OnBeginDocument",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxPrintout_base_OnBeginDocument",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2945,13 +3034,14 @@ static PyObject *_wrap_wxPrintout_base_OnBeginDocument(PyObject *self, PyObject
 }
 
 #define wxPrintout_base_OnEndDocument(_swigobj)  (_swigobj->base_OnEndDocument())
-static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnEndDocument",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnEndDocument",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2971,13 +3061,14 @@ static PyObject *_wrap_wxPrintout_base_OnEndDocument(PyObject *self, PyObject *a
 }
 
 #define wxPrintout_base_OnBeginPrinting(_swigobj)  (_swigobj->base_OnBeginPrinting())
-static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnBeginPrinting",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnBeginPrinting",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2997,13 +3088,14 @@ static PyObject *_wrap_wxPrintout_base_OnBeginPrinting(PyObject *self, PyObject
 }
 
 #define wxPrintout_base_OnEndPrinting(_swigobj)  (_swigobj->base_OnEndPrinting())
-static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnEndPrinting",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnEndPrinting",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3023,13 +3115,14 @@ static PyObject *_wrap_wxPrintout_base_OnEndPrinting(PyObject *self, PyObject *a
 }
 
 #define wxPrintout_base_OnPreparePrinting(_swigobj)  (_swigobj->base_OnPreparePrinting())
-static PyObject *_wrap_wxPrintout_base_OnPreparePrinting(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_base_OnPreparePrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_OnPreparePrinting",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_OnPreparePrinting",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3049,7 +3142,7 @@ static PyObject *_wrap_wxPrintout_base_OnPreparePrinting(PyObject *self, PyObjec
 }
 
 #define wxPrintout_base_GetPageInfo(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->base_GetPageInfo(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _arg0;
     int * _arg1;
@@ -3061,6 +3154,7 @@ static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *arg
     int * _arg4;
     int  temp2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -3075,7 +3169,7 @@ static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *arg
 {
   _arg4 = &temp2;
 }
-    if(!PyArg_ParseTuple(args,"O:wxPrintout_base_GetPageInfo",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintout_base_GetPageInfo",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3115,15 +3209,16 @@ static PyObject *_wrap_wxPrintout_base_GetPageInfo(PyObject *self, PyObject *arg
 }
 
 #define wxPrintout_base_HasPage(_swigobj,_swigarg0)  (_swigobj->base_HasPage(_swigarg0))
-static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyPrintout * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","page", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintout_base_HasPage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintout_base_HasPage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3142,15 +3237,16 @@ static PyObject *_wrap_wxPrintout_base_HasPage(PyObject *self, PyObject *args) {
 }
 
 #define new_wxPrinter(_swigarg0) (new wxPrinter(_swigarg0))
-static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrinter * _result;
     wxPrintDialogData * _arg0 = (wxPrintDialogData *) NULL;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|O:new_wxPrinter",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|O:new_wxPrinter",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3175,13 +3271,14 @@ static PyObject *_wrap_new_wxPrinter(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxPrinter(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPrinter(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPrinter(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrinter * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPrinter",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPrinter",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3201,7 +3298,7 @@ static PyObject *_wrap_delete_wxPrinter(PyObject *self, PyObject *args) {
 }
 
 #define wxPrinter_CreateAbortWindow(_swigobj,_swigarg0,_swigarg1)  (_swigobj->CreateAbortWindow(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrinter * _arg0;
     wxWindow * _arg1;
@@ -3209,9 +3306,10 @@ static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *arg
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","parent","printout", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxPrinter_CreateAbortWindow",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxPrinter_CreateAbortWindow",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3245,15 +3343,16 @@ static PyObject *_wrap_wxPrinter_CreateAbortWindow(PyObject *self, PyObject *arg
 }
 
 #define wxPrinter_GetPrintDialogData(_swigobj)  (_swigobj->GetPrintDialogData())
-static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrinter * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrinter_GetPrintDialogData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrinter_GetPrintDialogData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3279,7 +3378,7 @@ static PyObject *_wrap_wxPrinter_GetPrintDialogData(PyObject *self, PyObject *ar
 }
 
 #define wxPrinter_Print(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->Print(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxPrinter_Print(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrinter_Print(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrinter * _arg0;
@@ -3289,9 +3388,10 @@ static PyObject *_wrap_wxPrinter_Print(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","parent","printout","prompt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|i:wxPrinter_Print",&_argo0,&_argo1,&_argo2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|i:wxPrinter_Print",_kwnames,&_argo0,&_argo1,&_argo2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3324,17 +3424,18 @@ static PyObject *_wrap_wxPrinter_Print(PyObject *self, PyObject *args) {
 }
 
 #define wxPrinter_PrintDialog(_swigobj,_swigarg0)  (_swigobj->PrintDialog(_swigarg0))
-static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDC * _result;
     wxPrinter * _arg0;
     wxWindow * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","parent", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrinter_PrintDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrinter_PrintDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3366,7 +3467,7 @@ static PyObject *_wrap_wxPrinter_PrintDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxPrinter_ReportError(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->ReportError(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxPrinter_ReportError(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrinter_ReportError(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrinter * _arg0;
     wxWindow * _arg1;
@@ -3375,9 +3476,10 @@ static PyObject *_wrap_wxPrinter_ReportError(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","parent","printout","message", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOOs:wxPrinter_ReportError",&_argo0,&_argo1,&_argo2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOOs:wxPrinter_ReportError",_kwnames,&_argo0,&_argo1,&_argo2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3411,16 +3513,17 @@ static PyObject *_wrap_wxPrinter_ReportError(PyObject *self, PyObject *args) {
 }
 
 #define wxPrinter_Setup(_swigobj,_swigarg0)  (_swigobj->Setup(_swigarg0))
-static PyObject *_wrap_wxPrinter_Setup(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrinter_Setup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrinter * _arg0;
     wxWindow * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","parent", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrinter_Setup",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrinter_Setup",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3446,7 +3549,7 @@ static PyObject *_wrap_wxPrinter_Setup(PyObject *self, PyObject *args) {
 }
 
 #define new_wxPrintPreview(_swigarg0,_swigarg1,_swigarg2) (new wxPrintPreview(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintPreview * _result;
     wxPyPrintout * _arg0;
@@ -3455,10 +3558,11 @@ static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "printout","printoutForPrinting","data", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|O:new_wxPrintPreview",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:new_wxPrintPreview",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3497,15 +3601,16 @@ static PyObject *_wrap_new_wxPrintPreview(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintPreview_GetCanvas(_swigobj)  (_swigobj->GetCanvas())
-static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetCanvas",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetCanvas",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3530,14 +3635,15 @@ static PyObject *_wrap_wxPrintPreview_GetCanvas(PyObject *self, PyObject *args)
 }
 
 #define wxPrintPreview_GetCurrentPage(_swigobj)  (_swigobj->GetCurrentPage())
-static PyObject *_wrap_wxPrintPreview_GetCurrentPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetCurrentPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetCurrentPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3556,15 +3662,16 @@ static PyObject *_wrap_wxPrintPreview_GetCurrentPage(PyObject *self, PyObject *a
 }
 
 #define wxPrintPreview_GetFrame(_swigobj)  (_swigobj->GetFrame())
-static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFrame * _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetFrame",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetFrame",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3589,14 +3696,15 @@ static PyObject *_wrap_wxPrintPreview_GetFrame(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintPreview_GetMaxPage(_swigobj)  (_swigobj->GetMaxPage())
-static PyObject *_wrap_wxPrintPreview_GetMaxPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetMaxPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetMaxPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetMaxPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3615,14 +3723,15 @@ static PyObject *_wrap_wxPrintPreview_GetMaxPage(PyObject *self, PyObject *args)
 }
 
 #define wxPrintPreview_GetMinPage(_swigobj)  (_swigobj->GetMinPage())
-static PyObject *_wrap_wxPrintPreview_GetMinPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetMinPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetMinPage",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetMinPage",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3641,15 +3750,16 @@ static PyObject *_wrap_wxPrintPreview_GetMinPage(PyObject *self, PyObject *args)
 }
 
 #define wxPrintPreview_GetPrintDialogData(_swigobj)  (_swigobj->GetPrintDialogData())
-static PyObject *_wrap_wxPrintPreview_GetPrintDialogData(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetPrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintDialogData * _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetPrintDialogData",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintDialogData",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3675,15 +3785,16 @@ static PyObject *_wrap_wxPrintPreview_GetPrintDialogData(PyObject *self, PyObjec
 }
 
 #define wxPrintPreview_GetPrintout(_swigobj)  (_swigobj->GetPrintout())
-static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetPrintout",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintout",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3708,15 +3819,16 @@ static PyObject *_wrap_wxPrintPreview_GetPrintout(PyObject *self, PyObject *args
 }
 
 #define wxPrintPreview_GetPrintoutForPrinting(_swigobj)  (_swigobj->GetPrintoutForPrinting())
-static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyPrintout * _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetPrintoutForPrinting",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetPrintoutForPrinting",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3741,14 +3853,15 @@ static PyObject *_wrap_wxPrintPreview_GetPrintoutForPrinting(PyObject *self, PyO
 }
 
 #define wxPrintPreview_GetZoom(_swigobj)  (_swigobj->GetZoom())
-static PyObject *_wrap_wxPrintPreview_GetZoom(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_GetZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_GetZoom",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_GetZoom",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3767,14 +3880,15 @@ static PyObject *_wrap_wxPrintPreview_GetZoom(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintPreview_Ok(_swigobj)  (_swigobj->Ok())
-static PyObject *_wrap_wxPrintPreview_Ok(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_Ok(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintPreview * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPrintPreview_Ok",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPrintPreview_Ok",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3793,16 +3907,17 @@ static PyObject *_wrap_wxPrintPreview_Ok(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintPreview_Print(_swigobj,_swigarg0)  (_swigobj->Print(_swigarg0))
-static PyObject *_wrap_wxPrintPreview_Print(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_Print(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPrintPreview * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","prompt", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintPreview_Print",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_Print",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3822,15 +3937,16 @@ static PyObject *_wrap_wxPrintPreview_Print(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintPreview_SetCanvas(_swigobj,_swigarg0)  (_swigobj->SetCanvas(_swigarg0))
-static PyObject *_wrap_wxPrintPreview_SetCanvas(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_SetCanvas(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxWindow * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","window", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrintPreview_SetCanvas",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetCanvas",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3857,14 +3973,15 @@ static PyObject *_wrap_wxPrintPreview_SetCanvas(PyObject *self, PyObject *args)
 }
 
 #define wxPrintPreview_SetCurrentPage(_swigobj,_swigarg0)  (_swigobj->SetCurrentPage(_swigarg0))
-static PyObject *_wrap_wxPrintPreview_SetCurrentPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_SetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pageNum", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintPreview_SetCurrentPage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_SetCurrentPage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3884,15 +4001,16 @@ static PyObject *_wrap_wxPrintPreview_SetCurrentPage(PyObject *self, PyObject *a
 }
 
 #define wxPrintPreview_SetFrame(_swigobj,_swigarg0)  (_swigobj->SetFrame(_swigarg0))
-static PyObject *_wrap_wxPrintPreview_SetFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_SetFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxFrame * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","frame", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrintPreview_SetFrame",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetFrame",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3919,15 +4037,16 @@ static PyObject *_wrap_wxPrintPreview_SetFrame(PyObject *self, PyObject *args) {
 }
 
 #define wxPrintPreview_SetPrintout(_swigobj,_swigarg0)  (_swigobj->SetPrintout(_swigarg0))
-static PyObject *_wrap_wxPrintPreview_SetPrintout(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_SetPrintout(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     wxPyPrintout * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","printout", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPrintPreview_SetPrintout",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPrintPreview_SetPrintout",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3954,14 +4073,15 @@ static PyObject *_wrap_wxPrintPreview_SetPrintout(PyObject *self, PyObject *args
 }
 
 #define wxPrintPreview_SetZoom(_swigobj,_swigarg0)  (_swigobj->SetZoom(_swigarg0))
-static PyObject *_wrap_wxPrintPreview_SetZoom(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPrintPreview_SetZoom(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPrintPreview * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","percent", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPrintPreview_SetZoom",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPrintPreview_SetZoom",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4005,7 +4125,7 @@ static void *SwigwxPreviewFrameTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxPreviewFrame(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPreviewFrame * _result;
     wxPrintPreview * _arg0;
@@ -4020,10 +4140,11 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "preview","parent","title","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|OOls:new_wxPreviewFrame",&_argo0,&_argo1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|OOls:new_wxPreviewFrame",_kwnames,&_argo0,&_argo1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4080,13 +4201,14 @@ static PyObject *_wrap_new_wxPreviewFrame(PyObject *self, PyObject *args) {
 }
 
 #define wxPreviewFrame_Initialize(_swigobj)  (_swigobj->Initialize())
-static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPreviewFrame * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPreviewFrame_Initialize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPreviewFrame_Initialize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4106,130 +4228,130 @@ static PyObject *_wrap_wxPreviewFrame_Initialize(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef printfwcMethods[] = {
-	 { "wxPreviewFrame_Initialize", _wrap_wxPreviewFrame_Initialize, METH_VARARGS },
-	 { "new_wxPreviewFrame", _wrap_new_wxPreviewFrame, METH_VARARGS },
-	 { "wxPrintPreview_SetZoom", _wrap_wxPrintPreview_SetZoom, METH_VARARGS },
-	 { "wxPrintPreview_SetPrintout", _wrap_wxPrintPreview_SetPrintout, METH_VARARGS },
-	 { "wxPrintPreview_SetFrame", _wrap_wxPrintPreview_SetFrame, METH_VARARGS },
-	 { "wxPrintPreview_SetCurrentPage", _wrap_wxPrintPreview_SetCurrentPage, METH_VARARGS },
-	 { "wxPrintPreview_SetCanvas", _wrap_wxPrintPreview_SetCanvas, METH_VARARGS },
-	 { "wxPrintPreview_Print", _wrap_wxPrintPreview_Print, METH_VARARGS },
-	 { "wxPrintPreview_Ok", _wrap_wxPrintPreview_Ok, METH_VARARGS },
-	 { "wxPrintPreview_GetZoom", _wrap_wxPrintPreview_GetZoom, METH_VARARGS },
-	 { "wxPrintPreview_GetPrintoutForPrinting", _wrap_wxPrintPreview_GetPrintoutForPrinting, METH_VARARGS },
-	 { "wxPrintPreview_GetPrintout", _wrap_wxPrintPreview_GetPrintout, METH_VARARGS },
-	 { "wxPrintPreview_GetPrintDialogData", _wrap_wxPrintPreview_GetPrintDialogData, METH_VARARGS },
-	 { "wxPrintPreview_GetMinPage", _wrap_wxPrintPreview_GetMinPage, METH_VARARGS },
-	 { "wxPrintPreview_GetMaxPage", _wrap_wxPrintPreview_GetMaxPage, METH_VARARGS },
-	 { "wxPrintPreview_GetFrame", _wrap_wxPrintPreview_GetFrame, METH_VARARGS },
-	 { "wxPrintPreview_GetCurrentPage", _wrap_wxPrintPreview_GetCurrentPage, METH_VARARGS },
-	 { "wxPrintPreview_GetCanvas", _wrap_wxPrintPreview_GetCanvas, METH_VARARGS },
-	 { "new_wxPrintPreview", _wrap_new_wxPrintPreview, METH_VARARGS },
-	 { "wxPrinter_Setup", _wrap_wxPrinter_Setup, METH_VARARGS },
-	 { "wxPrinter_ReportError", _wrap_wxPrinter_ReportError, METH_VARARGS },
-	 { "wxPrinter_PrintDialog", _wrap_wxPrinter_PrintDialog, METH_VARARGS },
-	 { "wxPrinter_Print", _wrap_wxPrinter_Print, METH_VARARGS },
-	 { "wxPrinter_GetPrintDialogData", _wrap_wxPrinter_GetPrintDialogData, METH_VARARGS },
-	 { "wxPrinter_CreateAbortWindow", _wrap_wxPrinter_CreateAbortWindow, METH_VARARGS },
-	 { "delete_wxPrinter", _wrap_delete_wxPrinter, METH_VARARGS },
-	 { "new_wxPrinter", _wrap_new_wxPrinter, METH_VARARGS },
-	 { "wxPrintout_base_HasPage", _wrap_wxPrintout_base_HasPage, METH_VARARGS },
-	 { "wxPrintout_base_GetPageInfo", _wrap_wxPrintout_base_GetPageInfo, METH_VARARGS },
-	 { "wxPrintout_base_OnPreparePrinting", _wrap_wxPrintout_base_OnPreparePrinting, METH_VARARGS },
-	 { "wxPrintout_base_OnEndPrinting", _wrap_wxPrintout_base_OnEndPrinting, METH_VARARGS },
-	 { "wxPrintout_base_OnBeginPrinting", _wrap_wxPrintout_base_OnBeginPrinting, METH_VARARGS },
-	 { "wxPrintout_base_OnEndDocument", _wrap_wxPrintout_base_OnEndDocument, METH_VARARGS },
-	 { "wxPrintout_base_OnBeginDocument", _wrap_wxPrintout_base_OnBeginDocument, METH_VARARGS },
-	 { "wxPrintout_IsPreview", _wrap_wxPrintout_IsPreview, METH_VARARGS },
-	 { "wxPrintout_GetPPIScreen", _wrap_wxPrintout_GetPPIScreen, METH_VARARGS },
-	 { "wxPrintout_GetPPIPrinter", _wrap_wxPrintout_GetPPIPrinter, METH_VARARGS },
-	 { "wxPrintout_GetPageSizePixels", _wrap_wxPrintout_GetPageSizePixels, METH_VARARGS },
-	 { "wxPrintout_GetPageSizeMM", _wrap_wxPrintout_GetPageSizeMM, METH_VARARGS },
-	 { "wxPrintout_GetDC", _wrap_wxPrintout_GetDC, METH_VARARGS },
-	 { "wxPrintout_Destroy", _wrap_wxPrintout_Destroy, METH_VARARGS },
-	 { "wxPrintout__setSelf", _wrap_wxPrintout__setSelf, METH_VARARGS },
-	 { "new_wxPrintout", _wrap_new_wxPrintout, METH_VARARGS },
-	 { "wxPrintDialog_ShowModal", _wrap_wxPrintDialog_ShowModal, METH_VARARGS },
-	 { "wxPrintDialog_GetPrintDC", _wrap_wxPrintDialog_GetPrintDC, METH_VARARGS },
-	 { "wxPrintDialog_GetPrintDialogData", _wrap_wxPrintDialog_GetPrintDialogData, METH_VARARGS },
-	 { "new_wxPrintDialog", _wrap_new_wxPrintDialog, METH_VARARGS },
-	 { "wxPrintDialogData_SetToPage", _wrap_wxPrintDialogData_SetToPage, METH_VARARGS },
-	 { "wxPrintDialogData_SetSetupDialog", _wrap_wxPrintDialogData_SetSetupDialog, METH_VARARGS },
-	 { "wxPrintDialogData_SetPrintToFile", _wrap_wxPrintDialogData_SetPrintToFile, METH_VARARGS },
-	 { "wxPrintDialogData_SetPrintData", _wrap_wxPrintDialogData_SetPrintData, METH_VARARGS },
-	 { "wxPrintDialogData_SetNoCopies", _wrap_wxPrintDialogData_SetNoCopies, METH_VARARGS },
-	 { "wxPrintDialogData_SetMinPage", _wrap_wxPrintDialogData_SetMinPage, METH_VARARGS },
-	 { "wxPrintDialogData_SetMaxPage", _wrap_wxPrintDialogData_SetMaxPage, METH_VARARGS },
-	 { "wxPrintDialogData_SetFromPage", _wrap_wxPrintDialogData_SetFromPage, METH_VARARGS },
-	 { "wxPrintDialogData_SetCollate", _wrap_wxPrintDialogData_SetCollate, METH_VARARGS },
-	 { "wxPrintDialogData_GetToPage", _wrap_wxPrintDialogData_GetToPage, METH_VARARGS },
-	 { "wxPrintDialogData_GetPrintToFile", _wrap_wxPrintDialogData_GetPrintToFile, METH_VARARGS },
-	 { "wxPrintDialogData_GetPrintData", _wrap_wxPrintDialogData_GetPrintData, METH_VARARGS },
-	 { "wxPrintDialogData_GetNoCopies", _wrap_wxPrintDialogData_GetNoCopies, METH_VARARGS },
-	 { "wxPrintDialogData_GetMinPage", _wrap_wxPrintDialogData_GetMinPage, METH_VARARGS },
-	 { "wxPrintDialogData_GetMaxPage", _wrap_wxPrintDialogData_GetMaxPage, METH_VARARGS },
-	 { "wxPrintDialogData_GetFromPage", _wrap_wxPrintDialogData_GetFromPage, METH_VARARGS },
-	 { "wxPrintDialogData_GetCollate", _wrap_wxPrintDialogData_GetCollate, METH_VARARGS },
-	 { "wxPrintDialogData_GetAllPages", _wrap_wxPrintDialogData_GetAllPages, METH_VARARGS },
-	 { "wxPrintDialogData_EnableSelection", _wrap_wxPrintDialogData_EnableSelection, METH_VARARGS },
-	 { "wxPrintDialogData_EnablePrintToFile", _wrap_wxPrintDialogData_EnablePrintToFile, METH_VARARGS },
-	 { "wxPrintDialogData_EnablePageNumbers", _wrap_wxPrintDialogData_EnablePageNumbers, METH_VARARGS },
-	 { "wxPrintDialogData_EnableHelp", _wrap_wxPrintDialogData_EnableHelp, METH_VARARGS },
-	 { "delete_wxPrintDialogData", _wrap_delete_wxPrintDialogData, METH_VARARGS },
-	 { "new_wxPrintDialogData", _wrap_new_wxPrintDialogData, METH_VARARGS },
-	 { "wxPageSetupDialog_ShowModal", _wrap_wxPageSetupDialog_ShowModal, METH_VARARGS },
-	 { "wxPageSetupDialog_GetPageSetupData", _wrap_wxPageSetupDialog_GetPageSetupData, METH_VARARGS },
-	 { "new_wxPageSetupDialog", _wrap_new_wxPageSetupDialog, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetPrintData", _wrap_wxPageSetupDialogData_SetPrintData, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetPaperSize", _wrap_wxPageSetupDialogData_SetPaperSize, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetPaperId", _wrap_wxPageSetupDialogData_SetPaperId, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetMinMarginBottomRight", _wrap_wxPageSetupDialogData_SetMinMarginBottomRight, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetMinMarginTopLeft", _wrap_wxPageSetupDialogData_SetMinMarginTopLeft, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetMarginBottomRight", _wrap_wxPageSetupDialogData_SetMarginBottomRight, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetMarginTopLeft", _wrap_wxPageSetupDialogData_SetMarginTopLeft, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetDefaultMinMargins", _wrap_wxPageSetupDialogData_SetDefaultMinMargins, METH_VARARGS },
-	 { "wxPageSetupDialogData_SetDefaultInfo", _wrap_wxPageSetupDialogData_SetDefaultInfo, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetPrintData", _wrap_wxPageSetupDialogData_GetPrintData, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetPaperSize", _wrap_wxPageSetupDialogData_GetPaperSize, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetPaperId", _wrap_wxPageSetupDialogData_GetPaperId, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetMinMarginBottomRight", _wrap_wxPageSetupDialogData_GetMinMarginBottomRight, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetMinMarginTopLeft", _wrap_wxPageSetupDialogData_GetMinMarginTopLeft, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetMarginBottomRight", _wrap_wxPageSetupDialogData_GetMarginBottomRight, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetMarginTopLeft", _wrap_wxPageSetupDialogData_GetMarginTopLeft, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetDefaultInfo", _wrap_wxPageSetupDialogData_GetDefaultInfo, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetEnableHelp", _wrap_wxPageSetupDialogData_GetEnableHelp, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetEnablePrinter", _wrap_wxPageSetupDialogData_GetEnablePrinter, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetEnablePaper", _wrap_wxPageSetupDialogData_GetEnablePaper, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetEnableOrientation", _wrap_wxPageSetupDialogData_GetEnableOrientation, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetEnableMargins", _wrap_wxPageSetupDialogData_GetEnableMargins, METH_VARARGS },
-	 { "wxPageSetupDialogData_GetDefaultMinMargins", _wrap_wxPageSetupDialogData_GetDefaultMinMargins, METH_VARARGS },
-	 { "wxPageSetupDialogData_EnablePrinter", _wrap_wxPageSetupDialogData_EnablePrinter, METH_VARARGS },
-	 { "wxPageSetupDialogData_EnablePaper", _wrap_wxPageSetupDialogData_EnablePaper, METH_VARARGS },
-	 { "wxPageSetupDialogData_EnableOrientation", _wrap_wxPageSetupDialogData_EnableOrientation, METH_VARARGS },
-	 { "wxPageSetupDialogData_EnableMargins", _wrap_wxPageSetupDialogData_EnableMargins, METH_VARARGS },
-	 { "wxPageSetupDialogData_EnableHelp", _wrap_wxPageSetupDialogData_EnableHelp, METH_VARARGS },
-	 { "delete_wxPageSetupDialogData", _wrap_delete_wxPageSetupDialogData, METH_VARARGS },
-	 { "new_wxPageSetupDialogData", _wrap_new_wxPageSetupDialogData, METH_VARARGS },
-	 { "wxPrintData_SetQuality", _wrap_wxPrintData_SetQuality, METH_VARARGS },
-	 { "wxPrintData_SetPaperSize", _wrap_wxPrintData_SetPaperSize, METH_VARARGS },
-	 { "wxPrintData_SetPaperId", _wrap_wxPrintData_SetPaperId, METH_VARARGS },
-	 { "wxPrintData_SetDuplex", _wrap_wxPrintData_SetDuplex, METH_VARARGS },
-	 { "wxPrintData_SetColour", _wrap_wxPrintData_SetColour, METH_VARARGS },
-	 { "wxPrintData_SetPrinterName", _wrap_wxPrintData_SetPrinterName, METH_VARARGS },
-	 { "wxPrintData_SetOrientation", _wrap_wxPrintData_SetOrientation, METH_VARARGS },
-	 { "wxPrintData_SetCollate", _wrap_wxPrintData_SetCollate, METH_VARARGS },
-	 { "wxPrintData_SetNoCopies", _wrap_wxPrintData_SetNoCopies, METH_VARARGS },
-	 { "wxPrintData_GetQuality", _wrap_wxPrintData_GetQuality, METH_VARARGS },
-	 { "wxPrintData_GetPaperSize", _wrap_wxPrintData_GetPaperSize, METH_VARARGS },
-	 { "wxPrintData_GetPaperId", _wrap_wxPrintData_GetPaperId, METH_VARARGS },
-	 { "wxPrintData_GetDuplex", _wrap_wxPrintData_GetDuplex, METH_VARARGS },
-	 { "wxPrintData_GetColour", _wrap_wxPrintData_GetColour, METH_VARARGS },
-	 { "wxPrintData_GetPrinterName", _wrap_wxPrintData_GetPrinterName, METH_VARARGS },
-	 { "wxPrintData_GetOrientation", _wrap_wxPrintData_GetOrientation, METH_VARARGS },
-	 { "wxPrintData_GetCollate", _wrap_wxPrintData_GetCollate, METH_VARARGS },
-	 { "wxPrintData_GetNoCopies", _wrap_wxPrintData_GetNoCopies, METH_VARARGS },
-	 { "delete_wxPrintData", _wrap_delete_wxPrintData, METH_VARARGS },
-	 { "new_wxPrintData", _wrap_new_wxPrintData, METH_VARARGS },
+	 { "wxPreviewFrame_Initialize", (PyCFunction) _wrap_wxPreviewFrame_Initialize, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPreviewFrame", (PyCFunction) _wrap_new_wxPreviewFrame, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_SetZoom", (PyCFunction) _wrap_wxPrintPreview_SetZoom, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_SetPrintout", (PyCFunction) _wrap_wxPrintPreview_SetPrintout, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_SetFrame", (PyCFunction) _wrap_wxPrintPreview_SetFrame, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_SetCurrentPage", (PyCFunction) _wrap_wxPrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_SetCanvas", (PyCFunction) _wrap_wxPrintPreview_SetCanvas, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_Print", (PyCFunction) _wrap_wxPrintPreview_Print, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_Ok", (PyCFunction) _wrap_wxPrintPreview_Ok, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetZoom", (PyCFunction) _wrap_wxPrintPreview_GetZoom, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetPrintoutForPrinting", (PyCFunction) _wrap_wxPrintPreview_GetPrintoutForPrinting, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetPrintout", (PyCFunction) _wrap_wxPrintPreview_GetPrintout, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetPrintDialogData", (PyCFunction) _wrap_wxPrintPreview_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetMinPage", (PyCFunction) _wrap_wxPrintPreview_GetMinPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetMaxPage", (PyCFunction) _wrap_wxPrintPreview_GetMaxPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetFrame", (PyCFunction) _wrap_wxPrintPreview_GetFrame, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetCurrentPage", (PyCFunction) _wrap_wxPrintPreview_GetCurrentPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintPreview_GetCanvas", (PyCFunction) _wrap_wxPrintPreview_GetCanvas, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPrintPreview", (PyCFunction) _wrap_new_wxPrintPreview, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrinter_Setup", (PyCFunction) _wrap_wxPrinter_Setup, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrinter_ReportError", (PyCFunction) _wrap_wxPrinter_ReportError, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrinter_PrintDialog", (PyCFunction) _wrap_wxPrinter_PrintDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrinter_Print", (PyCFunction) _wrap_wxPrinter_Print, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrinter_GetPrintDialogData", (PyCFunction) _wrap_wxPrinter_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrinter_CreateAbortWindow", (PyCFunction) _wrap_wxPrinter_CreateAbortWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPrinter", (PyCFunction) _wrap_delete_wxPrinter, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPrinter", (PyCFunction) _wrap_new_wxPrinter, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_base_HasPage", (PyCFunction) _wrap_wxPrintout_base_HasPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_base_GetPageInfo", (PyCFunction) _wrap_wxPrintout_base_GetPageInfo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_base_OnPreparePrinting", (PyCFunction) _wrap_wxPrintout_base_OnPreparePrinting, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_base_OnEndPrinting", (PyCFunction) _wrap_wxPrintout_base_OnEndPrinting, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_base_OnBeginPrinting", (PyCFunction) _wrap_wxPrintout_base_OnBeginPrinting, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_base_OnEndDocument", (PyCFunction) _wrap_wxPrintout_base_OnEndDocument, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_base_OnBeginDocument", (PyCFunction) _wrap_wxPrintout_base_OnBeginDocument, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_IsPreview", (PyCFunction) _wrap_wxPrintout_IsPreview, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_GetPPIScreen", (PyCFunction) _wrap_wxPrintout_GetPPIScreen, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_GetPPIPrinter", (PyCFunction) _wrap_wxPrintout_GetPPIPrinter, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_GetPageSizePixels", (PyCFunction) _wrap_wxPrintout_GetPageSizePixels, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_GetPageSizeMM", (PyCFunction) _wrap_wxPrintout_GetPageSizeMM, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_GetDC", (PyCFunction) _wrap_wxPrintout_GetDC, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout_Destroy", (PyCFunction) _wrap_wxPrintout_Destroy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintout__setSelf", (PyCFunction) _wrap_wxPrintout__setSelf, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPrintout", (PyCFunction) _wrap_new_wxPrintout, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialog_ShowModal", (PyCFunction) _wrap_wxPrintDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialog_GetPrintDC", (PyCFunction) _wrap_wxPrintDialog_GetPrintDC, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialog_GetPrintDialogData", (PyCFunction) _wrap_wxPrintDialog_GetPrintDialogData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPrintDialog", (PyCFunction) _wrap_new_wxPrintDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetToPage", (PyCFunction) _wrap_wxPrintDialogData_SetToPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetSetupDialog", (PyCFunction) _wrap_wxPrintDialogData_SetSetupDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetPrintToFile", (PyCFunction) _wrap_wxPrintDialogData_SetPrintToFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetPrintData", (PyCFunction) _wrap_wxPrintDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetNoCopies", (PyCFunction) _wrap_wxPrintDialogData_SetNoCopies, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetMinPage", (PyCFunction) _wrap_wxPrintDialogData_SetMinPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetMaxPage", (PyCFunction) _wrap_wxPrintDialogData_SetMaxPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetFromPage", (PyCFunction) _wrap_wxPrintDialogData_SetFromPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_SetCollate", (PyCFunction) _wrap_wxPrintDialogData_SetCollate, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetToPage", (PyCFunction) _wrap_wxPrintDialogData_GetToPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetPrintToFile", (PyCFunction) _wrap_wxPrintDialogData_GetPrintToFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetPrintData", (PyCFunction) _wrap_wxPrintDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetNoCopies", (PyCFunction) _wrap_wxPrintDialogData_GetNoCopies, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetMinPage", (PyCFunction) _wrap_wxPrintDialogData_GetMinPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetMaxPage", (PyCFunction) _wrap_wxPrintDialogData_GetMaxPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetFromPage", (PyCFunction) _wrap_wxPrintDialogData_GetFromPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetCollate", (PyCFunction) _wrap_wxPrintDialogData_GetCollate, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_GetAllPages", (PyCFunction) _wrap_wxPrintDialogData_GetAllPages, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_EnableSelection", (PyCFunction) _wrap_wxPrintDialogData_EnableSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_EnablePrintToFile", (PyCFunction) _wrap_wxPrintDialogData_EnablePrintToFile, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_EnablePageNumbers", (PyCFunction) _wrap_wxPrintDialogData_EnablePageNumbers, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintDialogData_EnableHelp", (PyCFunction) _wrap_wxPrintDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPrintDialogData", (PyCFunction) _wrap_delete_wxPrintDialogData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPrintDialogData", (PyCFunction) _wrap_new_wxPrintDialogData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialog_ShowModal", (PyCFunction) _wrap_wxPageSetupDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialog_GetPageSetupData", (PyCFunction) _wrap_wxPageSetupDialog_GetPageSetupData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPageSetupDialog", (PyCFunction) _wrap_new_wxPageSetupDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetPrintData", (PyCFunction) _wrap_wxPageSetupDialogData_SetPrintData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetPaperSize", (PyCFunction) _wrap_wxPageSetupDialogData_SetPaperSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetPaperId", (PyCFunction) _wrap_wxPageSetupDialogData_SetPaperId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetMinMarginBottomRight", (PyCFunction) _wrap_wxPageSetupDialogData_SetMinMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetMinMarginTopLeft", (PyCFunction) _wrap_wxPageSetupDialogData_SetMinMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetMarginBottomRight", (PyCFunction) _wrap_wxPageSetupDialogData_SetMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetMarginTopLeft", (PyCFunction) _wrap_wxPageSetupDialogData_SetMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetDefaultMinMargins", (PyCFunction) _wrap_wxPageSetupDialogData_SetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_SetDefaultInfo", (PyCFunction) _wrap_wxPageSetupDialogData_SetDefaultInfo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetPrintData", (PyCFunction) _wrap_wxPageSetupDialogData_GetPrintData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetPaperSize", (PyCFunction) _wrap_wxPageSetupDialogData_GetPaperSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetPaperId", (PyCFunction) _wrap_wxPageSetupDialogData_GetPaperId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetMinMarginBottomRight", (PyCFunction) _wrap_wxPageSetupDialogData_GetMinMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetMinMarginTopLeft", (PyCFunction) _wrap_wxPageSetupDialogData_GetMinMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetMarginBottomRight", (PyCFunction) _wrap_wxPageSetupDialogData_GetMarginBottomRight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetMarginTopLeft", (PyCFunction) _wrap_wxPageSetupDialogData_GetMarginTopLeft, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetDefaultInfo", (PyCFunction) _wrap_wxPageSetupDialogData_GetDefaultInfo, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetEnableHelp", (PyCFunction) _wrap_wxPageSetupDialogData_GetEnableHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetEnablePrinter", (PyCFunction) _wrap_wxPageSetupDialogData_GetEnablePrinter, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetEnablePaper", (PyCFunction) _wrap_wxPageSetupDialogData_GetEnablePaper, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetEnableOrientation", (PyCFunction) _wrap_wxPageSetupDialogData_GetEnableOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetEnableMargins", (PyCFunction) _wrap_wxPageSetupDialogData_GetEnableMargins, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_GetDefaultMinMargins", (PyCFunction) _wrap_wxPageSetupDialogData_GetDefaultMinMargins, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_EnablePrinter", (PyCFunction) _wrap_wxPageSetupDialogData_EnablePrinter, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_EnablePaper", (PyCFunction) _wrap_wxPageSetupDialogData_EnablePaper, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_EnableOrientation", (PyCFunction) _wrap_wxPageSetupDialogData_EnableOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_EnableMargins", (PyCFunction) _wrap_wxPageSetupDialogData_EnableMargins, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPageSetupDialogData_EnableHelp", (PyCFunction) _wrap_wxPageSetupDialogData_EnableHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPageSetupDialogData", (PyCFunction) _wrap_delete_wxPageSetupDialogData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPageSetupDialogData", (PyCFunction) _wrap_new_wxPageSetupDialogData, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetQuality", (PyCFunction) _wrap_wxPrintData_SetQuality, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetPaperSize", (PyCFunction) _wrap_wxPrintData_SetPaperSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetPaperId", (PyCFunction) _wrap_wxPrintData_SetPaperId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetDuplex", (PyCFunction) _wrap_wxPrintData_SetDuplex, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetColour", (PyCFunction) _wrap_wxPrintData_SetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetPrinterName", (PyCFunction) _wrap_wxPrintData_SetPrinterName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetOrientation", (PyCFunction) _wrap_wxPrintData_SetOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetCollate", (PyCFunction) _wrap_wxPrintData_SetCollate, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_SetNoCopies", (PyCFunction) _wrap_wxPrintData_SetNoCopies, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetQuality", (PyCFunction) _wrap_wxPrintData_GetQuality, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetPaperSize", (PyCFunction) _wrap_wxPrintData_GetPaperSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetPaperId", (PyCFunction) _wrap_wxPrintData_GetPaperId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetDuplex", (PyCFunction) _wrap_wxPrintData_GetDuplex, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetColour", (PyCFunction) _wrap_wxPrintData_GetColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetPrinterName", (PyCFunction) _wrap_wxPrintData_GetPrinterName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetOrientation", (PyCFunction) _wrap_wxPrintData_GetOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetCollate", (PyCFunction) _wrap_wxPrintData_GetCollate, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPrintData_GetNoCopies", (PyCFunction) _wrap_wxPrintData_GetNoCopies, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPrintData", (PyCFunction) _wrap_delete_wxPrintData, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPrintData", (PyCFunction) _wrap_new_wxPrintData, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp
index 85a959ef04..90d1adac98 100644
--- a/utils/wxPython/src/msw/stattool.cpp
+++ b/utils/wxPython/src/msw/stattool.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -136,7 +136,7 @@ static void *SwigwxStatusBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _result;
     wxWindow * _arg0;
@@ -148,10 +148,11 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxStatusBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStatusBar",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -194,16 +195,17 @@ static wxRect * wxStatusBar_GetFieldRect(wxStatusBar *self,long  item) {
             self->GetFieldRect(item, *rect);
             return rect;
         }
-static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxStatusBar * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","item", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxStatusBar_GetFieldRect",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxStatusBar_GetFieldRect",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -228,14 +230,15 @@ static PyObject *_wrap_wxStatusBar_GetFieldRect(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_GetFieldsCount(_swigobj)  (_swigobj->GetFieldsCount())
-static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxStatusBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxStatusBar_GetFieldsCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStatusBar_GetFieldsCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -254,15 +257,16 @@ static PyObject *_wrap_wxStatusBar_GetFieldsCount(PyObject *self, PyObject *args
 }
 
 #define wxStatusBar_GetStatusText(_swigobj,_swigarg0)  (_swigobj->GetStatusText(_swigarg0))
-static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxStatusBar * _arg0;
     int  _arg1 = (int ) 0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","ir", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxStatusBar_GetStatusText",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxStatusBar_GetStatusText",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -286,16 +290,17 @@ static PyObject *_wrap_wxStatusBar_GetStatusText(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_DrawField(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DrawField(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","dc","i", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOi:wxStatusBar_DrawField",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxStatusBar_DrawField",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -322,16 +327,17 @@ static PyObject *_wrap_wxStatusBar_DrawField(PyObject *self, PyObject *args) {
 }
 
 #define wxStatusBar_DrawFieldText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->DrawFieldText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxDC * _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","dc","i", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOi:wxStatusBar_DrawFieldText",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOi:wxStatusBar_DrawFieldText",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -358,13 +364,14 @@ static PyObject *_wrap_wxStatusBar_DrawFieldText(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_InitColours(_swigobj)  (_swigobj->InitColours())
-static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxStatusBar_InitColours",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStatusBar_InitColours",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -384,14 +391,15 @@ static PyObject *_wrap_wxStatusBar_InitColours(PyObject *self, PyObject *args) {
 }
 
 #define wxStatusBar_SetFieldsCount(_swigobj,_swigarg0)  (_swigobj->SetFieldsCount(_swigarg0))
-static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     int  _arg1 = (int ) 1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","number", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxStatusBar_SetFieldsCount",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxStatusBar_SetFieldsCount",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -411,16 +419,17 @@ static PyObject *_wrap_wxStatusBar_SetFieldsCount(PyObject *self, PyObject *args
 }
 
 #define wxStatusBar_SetStatusText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     wxString * _arg1;
     int  _arg2 = (int ) 0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","text","i", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|i:wxStatusBar_SetStatusText",&_argo0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|i:wxStatusBar_SetStatusText",_kwnames,&_argo0,&_obj1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -451,16 +460,17 @@ static PyObject *_wrap_wxStatusBar_SetStatusText(PyObject *self, PyObject *args)
 }
 
 #define wxStatusBar_SetStatusWidths(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetStatusWidths(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxStatusBar * _arg0;
     int  _arg1;
     int * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","LIST", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxStatusBar_SetStatusWidths",&_argo0,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxStatusBar_SetStatusWidths",_kwnames,&_argo0,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -498,13 +508,14 @@ static PyObject *_wrap_wxStatusBar_SetStatusWidths(PyObject *self, PyObject *arg
 }
 
 #define new_wxToolBarTool() (new wxToolBarTool())
-static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBarTool * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxToolBarTool")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxToolBarTool",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -522,13 +533,14 @@ static PyObject *_wrap_new_wxToolBarTool(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxToolBarTool(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxToolBarTool",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxToolBarTool",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -548,15 +560,16 @@ static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_SetSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBarTool_SetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBarTool * _arg0;
     long  _arg1;
     long  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","w","h", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oll:wxToolBarTool_SetSize",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oll:wxToolBarTool_SetSize",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -576,14 +589,15 @@ static PyObject *_wrap_wxToolBarTool_SetSize(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_GetWidth(_swigobj)  (_swigobj->GetWidth())
-static PyObject *_wrap_wxToolBarTool_GetWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_GetWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_GetWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_GetWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -602,14 +616,15 @@ static PyObject *_wrap_wxToolBarTool_GetWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_GetHeight(_swigobj)  (_swigobj->GetHeight())
-static PyObject *_wrap_wxToolBarTool_GetHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_GetHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_GetHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_GetHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -628,15 +643,16 @@ static PyObject *_wrap_wxToolBarTool_GetHeight(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_m_toolStyle_set(_swigobj,_swigval) (_swigobj->m_toolStyle = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_toolStyle", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_toolStyle_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_toolStyle_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -655,14 +671,15 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *a
 }
 
 #define wxToolBarTool_m_toolStyle_get(_swigobj) ((int ) _swigobj->m_toolStyle)
-static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_toolStyle_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_toolStyle_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -681,17 +698,18 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *a
 }
 
 #define wxToolBarTool_m_clientData_set(_swigobj,_swigval) (_swigobj->m_clientData = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;
     wxObject * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","m_clientData", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_clientData_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_clientData_set",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -723,15 +741,16 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *
 }
 
 #define wxToolBarTool_m_clientData_get(_swigobj) ((wxObject *) _swigobj->m_clientData)
-static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxObject * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_clientData_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_clientData_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -756,15 +775,16 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *
 }
 
 #define wxToolBarTool_m_index_set(_swigobj,_swigval) (_swigobj->m_index = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_index", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_index_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_index_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -783,14 +803,15 @@ static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args)
 }
 
 #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index)
-static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_index_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_index_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -809,15 +830,16 @@ static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args)
 }
 
 #define wxToolBarTool_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_x_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_x", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_x_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_x_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -836,14 +858,15 @@ static PyObject *_wrap_wxToolBarTool_m_x_set(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_m_x_get(_swigobj) ((long ) _swigobj->m_x)
-static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_x_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_x_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -862,15 +885,16 @@ static PyObject *_wrap_wxToolBarTool_m_x_get(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_y_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_y_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_y_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -889,14 +913,15 @@ static PyObject *_wrap_wxToolBarTool_m_y_set(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_m_y_get(_swigobj) ((long ) _swigobj->m_y)
-static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_y_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_y_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -915,15 +940,16 @@ static PyObject *_wrap_wxToolBarTool_m_y_get(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBarTool_m_width_set(_swigobj,_swigval) (_swigobj->m_width = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_width_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_width_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_width_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_width_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -942,14 +968,15 @@ static PyObject *_wrap_wxToolBarTool_m_width_set(PyObject *self, PyObject *args)
 }
 
 #define wxToolBarTool_m_width_get(_swigobj) ((long ) _swigobj->m_width)
-static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_width_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_width_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -968,15 +995,16 @@ static PyObject *_wrap_wxToolBarTool_m_width_get(PyObject *self, PyObject *args)
 }
 
 #define wxToolBarTool_m_height_set(_swigobj,_swigval) (_swigobj->m_height = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_height_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_height_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxToolBarTool_m_height_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxToolBarTool_m_height_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -995,14 +1023,15 @@ static PyObject *_wrap_wxToolBarTool_m_height_set(PyObject *self, PyObject *args
 }
 
 #define wxToolBarTool_m_height_get(_swigobj) ((long ) _swigobj->m_height)
-static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_height_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_height_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1021,16 +1050,17 @@ static PyObject *_wrap_wxToolBarTool_m_height_get(PyObject *self, PyObject *args
 }
 
 #define wxToolBarTool_m_toggleState_set(_swigobj,_swigval) (_swigobj->m_toggleState = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_toggleState", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_toggleState_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_toggleState_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1050,14 +1080,15 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject
 }
 
 #define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState)
-static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_toggleState_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_toggleState_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1076,16 +1107,17 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject
 }
 
 #define wxToolBarTool_m_isToggle_set(_swigobj,_swigval) (_swigobj->m_isToggle = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_isToggle", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_isToggle_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_isToggle_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1105,14 +1137,15 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *ar
 }
 
 #define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle)
-static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_isToggle_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_isToggle_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1131,16 +1164,17 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *ar
 }
 
 #define wxToolBarTool_m_deleteSecondBitmap_set(_swigobj,_swigval) (_swigobj->m_deleteSecondBitmap = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_deleteSecondBitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_deleteSecondBitmap_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_deleteSecondBitmap_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1160,14 +1194,15 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, Py
 }
 
 #define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap)
-static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_deleteSecondBitmap_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_deleteSecondBitmap_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1186,16 +1221,17 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, Py
 }
 
 #define wxToolBarTool_m_enabled_set(_swigobj,_swigval) (_swigobj->m_enabled = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_enabled", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_enabled_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_enabled_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1215,14 +1251,15 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled)
-static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_enabled_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_enabled_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1241,17 +1278,18 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap1_set(_swigobj,_swigval) (_swigobj->m_bitmap1 = *(_swigval),_swigval)
-static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","m_bitmap1", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_bitmap1_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_bitmap1_set",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1283,15 +1321,16 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1)
-static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_bitmap1_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_bitmap1_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1316,17 +1355,18 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap2_set(_swigobj,_swigval) (_swigobj->m_bitmap2 = *(_swigval),_swigval)
-static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","m_bitmap2", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_bitmap2_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_bitmap2_set",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1358,15 +1398,16 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2)
-static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_bitmap2_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_bitmap2_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1391,16 +1432,17 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *arg
 }
 
 #define wxToolBarTool_m_isMenuCommand_set(_swigobj,_swigval) (_swigobj->m_isMenuCommand = _swigval,_swigval)
-static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_isMenuCommand", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBarTool_m_isMenuCommand_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarTool_m_isMenuCommand_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1420,14 +1462,15 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObjec
 }
 
 #define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand)
-static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_isMenuCommand_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_isMenuCommand_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1446,16 +1489,17 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObjec
 }
 
 #define wxToolBarTool_m_shortHelpString_set(_swigobj,_swigval) (_swigobj->m_shortHelpString = *(_swigval),_swigval)
-static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","m_shortHelpString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_shortHelpString_set",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_shortHelpString_set",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1487,14 +1531,15 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObj
 }
 
 #define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString)
-static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_shortHelpString_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_shortHelpString_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1515,16 +1560,17 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObj
 }
 
 #define wxToolBarTool_m_longHelpString_set(_swigobj,_swigval) (_swigobj->m_longHelpString = *(_swigval),_swigval)
-static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","m_longHelpString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolBarTool_m_longHelpString_set",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBarTool_m_longHelpString_set",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1556,14 +1602,15 @@ static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObje
 }
 
 #define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString)
-static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolBarTool * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBarTool_m_longHelpString_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarTool_m_longHelpString_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1608,7 +1655,7 @@ static void *SwigwxToolBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxToolBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _result;
     wxWindow * _arg0;
@@ -1620,10 +1667,11 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxToolBar",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxToolBar",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1662,13 +1710,14 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_AddSeparator(_swigobj)  (_swigobj->AddSeparator())
-static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_AddSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBar_AddSeparator",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_AddSeparator",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1692,7 +1741,7 @@ static wxToolBarTool * wxToolBar_AddTool(wxToolBar *self,int  toolIndex,const wx
                                  isToggle, xPos, yPos, NULL,
                                  shortHelpString, longHelpString);
         }
-static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBarTool * _result;
     wxToolBar * _arg0;
@@ -1709,10 +1758,11 @@ static PyObject *_wrap_wxToolBar_AddTool(PyObject *self, PyObject *args) {
     PyObject * _argo3 = 0;
     PyObject * _obj7 = 0;
     PyObject * _obj8 = 0;
+    char *_kwnames[] = { "self","toolIndex","bitmap1","bitmap2","isToggle","xPos","yPos","shortHelpString","longHelpString", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OillOO:wxToolBar_AddTool",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OillOO:wxToolBar_AddTool",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5,&_arg6,&_obj7,&_obj8)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1779,7 +1829,7 @@ static wxToolBarTool * wxToolBar_AddSimpleTool(wxToolBar *self,int  toolIndex,co
                                  FALSE, -1, -1, NULL,
                                  shortHelpString, longHelpString);
         }
-static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBarTool * _result;
     wxToolBar * _arg0;
@@ -1791,10 +1841,11 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _obj3 = 0;
     PyObject * _obj4 = 0;
+    char *_kwnames[] = { "self","toolIndex","bitmap","shortHelpString","longHelpString", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OO:wxToolBar_AddSimpleTool",&_argo0,&_arg1,&_argo2,&_obj3,&_obj4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OO:wxToolBar_AddSimpleTool",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1850,16 +1901,17 @@ static PyObject *_wrap_wxToolBar_AddSimpleTool(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_EnableTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTool(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","toolIndex","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxToolBar_EnableTool",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_EnableTool",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1880,17 +1932,18 @@ static PyObject *_wrap_wxToolBar_EnableTool(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_FindToolForPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->FindToolForPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBarTool * _result;
     wxToolBar * _arg0;
     float  _arg1;
     float  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Off:wxToolBar_FindToolForPosition",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Off:wxToolBar_FindToolForPosition",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1915,15 +1968,16 @@ static PyObject *_wrap_wxToolBar_FindToolForPosition(PyObject *self, PyObject *a
 }
 
 #define wxToolBar_GetToolSize(_swigobj)  (_swigobj->GetToolSize())
-static PyObject *_wrap_wxToolBar_GetToolSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1943,15 +1997,16 @@ static PyObject *_wrap_wxToolBar_GetToolSize(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_GetToolBitmapSize(_swigobj)  (_swigobj->GetToolBitmapSize())
-static PyObject *_wrap_wxToolBar_GetToolBitmapSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolBitmapSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolBitmapSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1971,15 +2026,16 @@ static PyObject *_wrap_wxToolBar_GetToolBitmapSize(PyObject *self, PyObject *arg
 }
 
 #define wxToolBar_SetToolBitmapSize(_swigobj,_swigarg0)  (_swigobj->SetToolBitmapSize(_swigarg0))
-static PyObject *_wrap_wxToolBar_SetToolBitmapSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolBitmapSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolBar_SetToolBitmapSize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_SetToolBitmapSize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2006,15 +2062,16 @@ static PyObject *_wrap_wxToolBar_SetToolBitmapSize(PyObject *self, PyObject *arg
 }
 
 #define wxToolBar_GetMaxSize(_swigobj)  (_swigobj->GetMaxSize())
-static PyObject *_wrap_wxToolBar_GetMaxSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetMaxSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetMaxSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetMaxSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2034,15 +2091,16 @@ static PyObject *_wrap_wxToolBar_GetMaxSize(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_GetToolEnabled(_swigobj,_swigarg0)  (_swigobj->GetToolEnabled(_swigarg0))
-static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","toolIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolEnabled",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolEnabled",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2061,15 +2119,16 @@ static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_GetToolLongHelp(_swigobj,_swigarg0)  (_swigobj->GetToolLongHelp(_swigarg0))
-static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","toolIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolLongHelp",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolLongHelp",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2093,14 +2152,15 @@ static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_GetToolPacking(_swigobj)  (_swigobj->GetToolPacking())
-static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolPacking",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolPacking",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2119,14 +2179,15 @@ static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_GetToolSeparation(_swigobj)  (_swigobj->GetToolSeparation())
-static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBar_GetToolSeparation",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_GetToolSeparation",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2145,15 +2206,16 @@ static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *arg
 }
 
 #define wxToolBar_GetToolShortHelp(_swigobj,_swigarg0)  (_swigobj->GetToolShortHelp(_swigarg0))
-static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","toolIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolShortHelp",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolShortHelp",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2177,15 +2239,16 @@ static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args
 }
 
 #define wxToolBar_GetToolState(_swigobj,_swigarg0)  (_swigobj->GetToolState(_swigarg0))
-static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","toolIndex", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_GetToolState",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_GetToolState",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2204,14 +2267,15 @@ static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_Realize(_swigobj)  (_swigobj->Realize())
-static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxToolBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxToolBar_Realize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBar_Realize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2230,16 +2294,17 @@ static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","toolIndex","helpString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxToolBar_SetToolLongHelp",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBar_SetToolLongHelp",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2270,16 +2335,17 @@ static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","toolIndex","helpString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxToolBar_SetToolShortHelp",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxToolBar_SetToolShortHelp",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2310,15 +2376,16 @@ static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args
 }
 
 #define wxToolBar_SetMargins(_swigobj,_swigarg0)  (_swigobj->SetMargins(_swigarg0))
-static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxToolBar_SetMargins",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxToolBar_SetMargins",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2345,14 +2412,15 @@ static PyObject *_wrap_wxToolBar_SetMargins(PyObject *self, PyObject *args) {
 }
 
 #define wxToolBar_SetToolPacking(_swigobj,_swigarg0)  (_swigobj->SetToolPacking(_swigarg0))
-static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","packing", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_SetToolPacking",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_SetToolPacking",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2372,14 +2440,15 @@ static PyObject *_wrap_wxToolBar_SetToolPacking(PyObject *self, PyObject *args)
 }
 
 #define wxToolBar_SetToolSeparation(_swigobj,_swigarg0)  (_swigobj->SetToolSeparation(_swigarg0))
-static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","separation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxToolBar_SetToolSeparation",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBar_SetToolSeparation",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2399,16 +2468,17 @@ static PyObject *_wrap_wxToolBar_SetToolSeparation(PyObject *self, PyObject *arg
 }
 
 #define wxToolBar_ToggleTool(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ToggleTool(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","toolIndex","toggle", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxToolBar_ToggleTool",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxToolBar_ToggleTool",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2429,76 +2499,76 @@ static PyObject *_wrap_wxToolBar_ToggleTool(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef stattoolcMethods[] = {
-	 { "wxToolBar_ToggleTool", _wrap_wxToolBar_ToggleTool, METH_VARARGS },
-	 { "wxToolBar_SetToolSeparation", _wrap_wxToolBar_SetToolSeparation, METH_VARARGS },
-	 { "wxToolBar_SetToolPacking", _wrap_wxToolBar_SetToolPacking, METH_VARARGS },
-	 { "wxToolBar_SetMargins", _wrap_wxToolBar_SetMargins, METH_VARARGS },
-	 { "wxToolBar_SetToolShortHelp", _wrap_wxToolBar_SetToolShortHelp, METH_VARARGS },
-	 { "wxToolBar_SetToolLongHelp", _wrap_wxToolBar_SetToolLongHelp, METH_VARARGS },
-	 { "wxToolBar_Realize", _wrap_wxToolBar_Realize, METH_VARARGS },
-	 { "wxToolBar_GetToolState", _wrap_wxToolBar_GetToolState, METH_VARARGS },
-	 { "wxToolBar_GetToolShortHelp", _wrap_wxToolBar_GetToolShortHelp, METH_VARARGS },
-	 { "wxToolBar_GetToolSeparation", _wrap_wxToolBar_GetToolSeparation, METH_VARARGS },
-	 { "wxToolBar_GetToolPacking", _wrap_wxToolBar_GetToolPacking, METH_VARARGS },
-	 { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, METH_VARARGS },
-	 { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, METH_VARARGS },
-	 { "wxToolBar_GetMaxSize", _wrap_wxToolBar_GetMaxSize, METH_VARARGS },
-	 { "wxToolBar_SetToolBitmapSize", _wrap_wxToolBar_SetToolBitmapSize, METH_VARARGS },
-	 { "wxToolBar_GetToolBitmapSize", _wrap_wxToolBar_GetToolBitmapSize, METH_VARARGS },
-	 { "wxToolBar_GetToolSize", _wrap_wxToolBar_GetToolSize, METH_VARARGS },
-	 { "wxToolBar_FindToolForPosition", _wrap_wxToolBar_FindToolForPosition, METH_VARARGS },
-	 { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, METH_VARARGS },
-	 { "wxToolBar_AddSimpleTool", _wrap_wxToolBar_AddSimpleTool, METH_VARARGS },
-	 { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, METH_VARARGS },
-	 { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, METH_VARARGS },
-	 { "new_wxToolBar", _wrap_new_wxToolBar, METH_VARARGS },
-	 { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, METH_VARARGS },
-	 { "wxToolBarTool_m_longHelpString_set", _wrap_wxToolBarTool_m_longHelpString_set, METH_VARARGS },
-	 { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, METH_VARARGS },
-	 { "wxToolBarTool_m_shortHelpString_set", _wrap_wxToolBarTool_m_shortHelpString_set, METH_VARARGS },
-	 { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, METH_VARARGS },
-	 { "wxToolBarTool_m_isMenuCommand_set", _wrap_wxToolBarTool_m_isMenuCommand_set, METH_VARARGS },
-	 { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, METH_VARARGS },
-	 { "wxToolBarTool_m_bitmap2_set", _wrap_wxToolBarTool_m_bitmap2_set, METH_VARARGS },
-	 { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, METH_VARARGS },
-	 { "wxToolBarTool_m_bitmap1_set", _wrap_wxToolBarTool_m_bitmap1_set, METH_VARARGS },
-	 { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, METH_VARARGS },
-	 { "wxToolBarTool_m_enabled_set", _wrap_wxToolBarTool_m_enabled_set, METH_VARARGS },
-	 { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, METH_VARARGS },
-	 { "wxToolBarTool_m_deleteSecondBitmap_set", _wrap_wxToolBarTool_m_deleteSecondBitmap_set, METH_VARARGS },
-	 { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, METH_VARARGS },
-	 { "wxToolBarTool_m_isToggle_set", _wrap_wxToolBarTool_m_isToggle_set, METH_VARARGS },
-	 { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, METH_VARARGS },
-	 { "wxToolBarTool_m_toggleState_set", _wrap_wxToolBarTool_m_toggleState_set, METH_VARARGS },
-	 { "wxToolBarTool_m_height_get", _wrap_wxToolBarTool_m_height_get, METH_VARARGS },
-	 { "wxToolBarTool_m_height_set", _wrap_wxToolBarTool_m_height_set, METH_VARARGS },
-	 { "wxToolBarTool_m_width_get", _wrap_wxToolBarTool_m_width_get, METH_VARARGS },
-	 { "wxToolBarTool_m_width_set", _wrap_wxToolBarTool_m_width_set, METH_VARARGS },
-	 { "wxToolBarTool_m_y_get", _wrap_wxToolBarTool_m_y_get, METH_VARARGS },
-	 { "wxToolBarTool_m_y_set", _wrap_wxToolBarTool_m_y_set, METH_VARARGS },
-	 { "wxToolBarTool_m_x_get", _wrap_wxToolBarTool_m_x_get, METH_VARARGS },
-	 { "wxToolBarTool_m_x_set", _wrap_wxToolBarTool_m_x_set, METH_VARARGS },
-	 { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, METH_VARARGS },
-	 { "wxToolBarTool_m_index_set", _wrap_wxToolBarTool_m_index_set, METH_VARARGS },
-	 { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, METH_VARARGS },
-	 { "wxToolBarTool_m_clientData_set", _wrap_wxToolBarTool_m_clientData_set, METH_VARARGS },
-	 { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, METH_VARARGS },
-	 { "wxToolBarTool_m_toolStyle_set", _wrap_wxToolBarTool_m_toolStyle_set, METH_VARARGS },
-	 { "wxToolBarTool_GetHeight", _wrap_wxToolBarTool_GetHeight, METH_VARARGS },
-	 { "wxToolBarTool_GetWidth", _wrap_wxToolBarTool_GetWidth, METH_VARARGS },
-	 { "wxToolBarTool_SetSize", _wrap_wxToolBarTool_SetSize, METH_VARARGS },
-	 { "delete_wxToolBarTool", _wrap_delete_wxToolBarTool, METH_VARARGS },
-	 { "new_wxToolBarTool", _wrap_new_wxToolBarTool, METH_VARARGS },
-	 { "wxStatusBar_SetStatusWidths", _wrap_wxStatusBar_SetStatusWidths, METH_VARARGS },
-	 { "wxStatusBar_SetStatusText", _wrap_wxStatusBar_SetStatusText, METH_VARARGS },
-	 { "wxStatusBar_SetFieldsCount", _wrap_wxStatusBar_SetFieldsCount, METH_VARARGS },
-	 { "wxStatusBar_InitColours", _wrap_wxStatusBar_InitColours, METH_VARARGS },
-	 { "wxStatusBar_DrawFieldText", _wrap_wxStatusBar_DrawFieldText, METH_VARARGS },
-	 { "wxStatusBar_DrawField", _wrap_wxStatusBar_DrawField, METH_VARARGS },
-	 { "wxStatusBar_GetStatusText", _wrap_wxStatusBar_GetStatusText, METH_VARARGS },
-	 { "wxStatusBar_GetFieldsCount", _wrap_wxStatusBar_GetFieldsCount, METH_VARARGS },
-	 { "wxStatusBar_GetFieldRect", _wrap_wxStatusBar_GetFieldRect, METH_VARARGS },
-	 { "new_wxStatusBar", _wrap_new_wxStatusBar, METH_VARARGS },
+	 { "wxToolBar_ToggleTool", (PyCFunction) _wrap_wxToolBar_ToggleTool, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_SetToolSeparation", (PyCFunction) _wrap_wxToolBar_SetToolSeparation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_SetToolPacking", (PyCFunction) _wrap_wxToolBar_SetToolPacking, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_SetMargins", (PyCFunction) _wrap_wxToolBar_SetMargins, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_SetToolShortHelp", (PyCFunction) _wrap_wxToolBar_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_SetToolLongHelp", (PyCFunction) _wrap_wxToolBar_SetToolLongHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_Realize", (PyCFunction) _wrap_wxToolBar_Realize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolState", (PyCFunction) _wrap_wxToolBar_GetToolState, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolShortHelp", (PyCFunction) _wrap_wxToolBar_GetToolShortHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolSeparation", (PyCFunction) _wrap_wxToolBar_GetToolSeparation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolPacking", (PyCFunction) _wrap_wxToolBar_GetToolPacking, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolLongHelp", (PyCFunction) _wrap_wxToolBar_GetToolLongHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolEnabled", (PyCFunction) _wrap_wxToolBar_GetToolEnabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetMaxSize", (PyCFunction) _wrap_wxToolBar_GetMaxSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_SetToolBitmapSize", (PyCFunction) _wrap_wxToolBar_SetToolBitmapSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolBitmapSize", (PyCFunction) _wrap_wxToolBar_GetToolBitmapSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_GetToolSize", (PyCFunction) _wrap_wxToolBar_GetToolSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_FindToolForPosition", (PyCFunction) _wrap_wxToolBar_FindToolForPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_EnableTool", (PyCFunction) _wrap_wxToolBar_EnableTool, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_AddSimpleTool", (PyCFunction) _wrap_wxToolBar_AddSimpleTool, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_AddTool", (PyCFunction) _wrap_wxToolBar_AddTool, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBar_AddSeparator", (PyCFunction) _wrap_wxToolBar_AddSeparator, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxToolBar", (PyCFunction) _wrap_new_wxToolBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_longHelpString_get", (PyCFunction) _wrap_wxToolBarTool_m_longHelpString_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_longHelpString_set", (PyCFunction) _wrap_wxToolBarTool_m_longHelpString_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_shortHelpString_get", (PyCFunction) _wrap_wxToolBarTool_m_shortHelpString_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_shortHelpString_set", (PyCFunction) _wrap_wxToolBarTool_m_shortHelpString_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_isMenuCommand_get", (PyCFunction) _wrap_wxToolBarTool_m_isMenuCommand_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_isMenuCommand_set", (PyCFunction) _wrap_wxToolBarTool_m_isMenuCommand_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_bitmap2_get", (PyCFunction) _wrap_wxToolBarTool_m_bitmap2_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_bitmap2_set", (PyCFunction) _wrap_wxToolBarTool_m_bitmap2_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_bitmap1_get", (PyCFunction) _wrap_wxToolBarTool_m_bitmap1_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_bitmap1_set", (PyCFunction) _wrap_wxToolBarTool_m_bitmap1_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_enabled_get", (PyCFunction) _wrap_wxToolBarTool_m_enabled_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_enabled_set", (PyCFunction) _wrap_wxToolBarTool_m_enabled_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_deleteSecondBitmap_get", (PyCFunction) _wrap_wxToolBarTool_m_deleteSecondBitmap_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_deleteSecondBitmap_set", (PyCFunction) _wrap_wxToolBarTool_m_deleteSecondBitmap_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_isToggle_get", (PyCFunction) _wrap_wxToolBarTool_m_isToggle_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_isToggle_set", (PyCFunction) _wrap_wxToolBarTool_m_isToggle_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_toggleState_get", (PyCFunction) _wrap_wxToolBarTool_m_toggleState_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_toggleState_set", (PyCFunction) _wrap_wxToolBarTool_m_toggleState_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_height_get", (PyCFunction) _wrap_wxToolBarTool_m_height_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_height_set", (PyCFunction) _wrap_wxToolBarTool_m_height_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_width_get", (PyCFunction) _wrap_wxToolBarTool_m_width_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_width_set", (PyCFunction) _wrap_wxToolBarTool_m_width_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_y_get", (PyCFunction) _wrap_wxToolBarTool_m_y_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_y_set", (PyCFunction) _wrap_wxToolBarTool_m_y_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_x_get", (PyCFunction) _wrap_wxToolBarTool_m_x_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_x_set", (PyCFunction) _wrap_wxToolBarTool_m_x_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_index_get", (PyCFunction) _wrap_wxToolBarTool_m_index_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_index_set", (PyCFunction) _wrap_wxToolBarTool_m_index_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_clientData_get", (PyCFunction) _wrap_wxToolBarTool_m_clientData_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_clientData_set", (PyCFunction) _wrap_wxToolBarTool_m_clientData_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_toolStyle_get", (PyCFunction) _wrap_wxToolBarTool_m_toolStyle_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_m_toolStyle_set", (PyCFunction) _wrap_wxToolBarTool_m_toolStyle_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_GetHeight", (PyCFunction) _wrap_wxToolBarTool_GetHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_GetWidth", (PyCFunction) _wrap_wxToolBarTool_GetWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxToolBarTool_SetSize", (PyCFunction) _wrap_wxToolBarTool_SetSize, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxToolBarTool", (PyCFunction) _wrap_delete_wxToolBarTool, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxToolBarTool", (PyCFunction) _wrap_new_wxToolBarTool, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_SetStatusWidths", (PyCFunction) _wrap_wxStatusBar_SetStatusWidths, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_SetStatusText", (PyCFunction) _wrap_wxStatusBar_SetStatusText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_SetFieldsCount", (PyCFunction) _wrap_wxStatusBar_SetFieldsCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_InitColours", (PyCFunction) _wrap_wxStatusBar_InitColours, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_DrawFieldText", (PyCFunction) _wrap_wxStatusBar_DrawFieldText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_DrawField", (PyCFunction) _wrap_wxStatusBar_DrawField, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_GetStatusText", (PyCFunction) _wrap_wxStatusBar_GetStatusText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_GetFieldsCount", (PyCFunction) _wrap_wxStatusBar_GetFieldsCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxStatusBar_GetFieldRect", (PyCFunction) _wrap_wxStatusBar_GetFieldRect, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxStatusBar", (PyCFunction) _wrap_new_wxStatusBar, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp
index 54c3ce3c15..7514134500 100644
--- a/utils/wxPython/src/msw/windows.cpp
+++ b/utils/wxPython/src/msw/windows.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 802)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -129,13 +129,14 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":wxWindow_FindFocus")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxWindow_FindFocus",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -152,14 +153,15 @@ static PyObject *_wrap_wxWindow_FindFocus(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_wxWindow_FromHWND(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_FromHWND(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     unsigned long  _arg0;
+    char *_kwnames[] = { "hWnd", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"l:wxWindow_FromHWND",&_arg0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"l:wxWindow_FromHWND",_kwnames,&_arg0)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -177,16 +179,17 @@ static PyObject *_wrap_wxWindow_FromHWND(PyObject *self, PyObject *args) {
 }
 
 #define wxEvtHandler_ProcessEvent(_swigobj,_swigarg0)  (_swigobj->ProcessEvent(_swigarg0))
-static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvtHandler_ProcessEvent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxEvtHandler * _arg0;
     wxEvent * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","event", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxEvtHandler_ProcessEvent",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxEvtHandler_ProcessEvent",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -218,7 +221,7 @@ static void  wxEvtHandler_Connect(wxEvtHandler *self,int  id,int  lastId,int  ev
                           new wxPyCallback(func));
             }
         }
-static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxEvtHandler * _arg0;
     int  _arg1;
@@ -227,9 +230,10 @@ static PyObject *_wrap_wxEvtHandler_Connect(PyObject *self, PyObject *args) {
     PyObject * _arg4;
     PyObject * _argo0 = 0;
     PyObject * _obj4 = 0;
+    char *_kwnames[] = { "self","id","lastId","eventType","func", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiiiO:wxEvtHandler_Connect",&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiiO:wxEvtHandler_Connect",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_obj4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -260,7 +264,7 @@ static void *SwigwxWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
@@ -272,10 +276,11 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -314,13 +319,14 @@ static PyObject *_wrap_new_wxWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_CaptureMouse(_swigobj)  (_swigobj->CaptureMouse())
-static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_CaptureMouse",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_CaptureMouse",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -340,14 +346,15 @@ static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Center(_swigobj,_swigarg0)  (_swigobj->Center(_swigarg0))
-static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1 = (int ) wxBOTH;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxWindow_Center",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_Center",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -367,14 +374,15 @@ static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))
-static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1 = (int ) wxBOTH;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxWindow_Centre",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_Centre",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -394,14 +402,15 @@ static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_CentreOnParent(_swigobj,_swigarg0)  (_swigobj->CentreOnParent(_swigarg0))
-static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1 = (int ) wxBOTH;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxWindow_CentreOnParent",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_CentreOnParent",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -421,14 +430,15 @@ static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_CenterOnParent(_swigobj,_swigarg0)  (_swigobj->CenterOnParent(_swigarg0))
-static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1 = (int ) wxBOTH;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxWindow_CenterOnParent",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_CenterOnParent",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -448,7 +458,7 @@ static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_ClientToScreenXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ClientToScreen(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
@@ -458,9 +468,10 @@ static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args)
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxWindow_ClientToScreenXY",&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_ClientToScreenXY",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -498,17 +509,18 @@ static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_ClientToScreen(_swigobj,_swigarg0)  (_swigobj->ClientToScreen(_swigarg0))
-static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_ClientToScreen",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ClientToScreen",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -535,15 +547,16 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Close(_swigobj,_swigarg0)  (_swigobj->Close(_swigarg0))
-static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     int  _arg1 = (int ) FALSE;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","force", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxWindow_Close",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxWindow_Close",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -562,14 +575,15 @@ static PyObject *_wrap_wxWindow_Close(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Destroy(_swigobj)  (_swigobj->Destroy())
-static PyObject *_wrap_wxWindow_Destroy(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_Destroy",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Destroy",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -588,13 +602,14 @@ static PyObject *_wrap_wxWindow_Destroy(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_DestroyChildren(_swigobj)  (_swigobj->DestroyChildren())
-static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_DestroyChildren",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_DestroyChildren",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -614,15 +629,16 @@ static PyObject *_wrap_wxWindow_DestroyChildren(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_DragAcceptFiles(_swigobj,_swigarg0)  (_swigobj->DragAcceptFiles(_swigarg0))
-static PyObject *_wrap_wxWindow_DragAcceptFiles(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_DragAcceptFiles(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","accept", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_DragAcceptFiles",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_DragAcceptFiles",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -643,15 +659,16 @@ static PyObject *_wrap_wxWindow_DragAcceptFiles(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
-static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_Enable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_Enable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -672,16 +689,17 @@ static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_FindWindowById(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))
-static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     long  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Ol:wxWindow_FindWindowById",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxWindow_FindWindowById",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -706,17 +724,18 @@ static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_FindWindowByName(_swigobj,_swigarg0)  (_swigobj->FindWindow(_swigarg0))
-static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_FindWindowByName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_FindWindowByName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -752,13 +771,14 @@ static PyObject *_wrap_wxWindow_FindWindowByName(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_Fit(_swigobj)  (_swigobj->Fit())
-static PyObject *_wrap_wxWindow_Fit(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Fit(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_Fit",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Fit",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -778,15 +798,16 @@ static PyObject *_wrap_wxWindow_Fit(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetBackgroundColour(_swigobj)  (_swigobj->GetBackgroundColour())
-static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetBackgroundColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetBackgroundColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -806,14 +827,15 @@ static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *ar
 }
 
 #define wxWindow_GetCharHeight(_swigobj)  (_swigobj->GetCharHeight())
-static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetCharHeight",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetCharHeight",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -832,14 +854,15 @@ static PyObject *_wrap_wxWindow_GetCharHeight(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetCharWidth(_swigobj)  (_swigobj->GetCharWidth())
-static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetCharWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetCharWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -858,7 +881,7 @@ static PyObject *_wrap_wxWindow_GetCharWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetClientSizeTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
@@ -866,6 +889,7 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *arg
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -874,7 +898,7 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *arg
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetClientSizeTuple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetClientSizeTuple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -904,15 +928,16 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *arg
 }
 
 #define wxWindow_GetClientSize(_swigobj)  (_swigobj->GetClientSize())
-static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetClientSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetClientSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -932,15 +957,16 @@ static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetConstraints(_swigobj)  (_swigobj->GetConstraints())
-static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutConstraints * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetConstraints",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetConstraints",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -965,15 +991,16 @@ static PyObject *_wrap_wxWindow_GetConstraints(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetFont(_swigobj)  (_swigobj->GetFont())
-static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -999,15 +1026,16 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetForegroundColour(_swigobj)  (_swigobj->GetForegroundColour())
-static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetForegroundColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetForegroundColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1027,15 +1055,16 @@ static PyObject *_wrap_wxWindow_GetForegroundColour(PyObject *self, PyObject *ar
 }
 
 #define wxWindow_GetGrandParent(_swigobj)  (_swigobj->GetGrandParent())
-static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetGrandParent",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetGrandParent",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1060,14 +1089,15 @@ static PyObject *_wrap_wxWindow_GetGrandParent(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetId(_swigobj)  (_swigobj->GetId())
-static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1086,14 +1116,15 @@ static PyObject *_wrap_wxWindow_GetId(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetLabel(_swigobj)  (_swigobj->GetLabel())
-static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetLabel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetLabel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1117,15 +1148,16 @@ static PyObject *_wrap_wxWindow_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetLabel(_swigobj,_swigarg0)  (_swigobj->SetLabel(_swigarg0))
-static PyObject *_wrap_wxWindow_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetLabel",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetLabel",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1156,14 +1188,15 @@ static PyObject *_wrap_wxWindow_SetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetName(_swigobj)  (_swigobj->GetName())
-static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1187,15 +1220,16 @@ static PyObject *_wrap_wxWindow_GetName(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetParent(_swigobj)  (_swigobj->GetParent())
-static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetParent",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetParent",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1220,7 +1254,7 @@ static PyObject *_wrap_wxWindow_GetParent(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetPositionTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
@@ -1228,6 +1262,7 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args)
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -1236,7 +1271,7 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args)
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetPositionTuple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetPositionTuple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1266,15 +1301,16 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1294,15 +1330,16 @@ static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetRect(_swigobj)  (_swigobj->GetRect())
-static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetRect",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetRect",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1322,15 +1359,16 @@ static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetScrollThumb(_swigobj,_swigarg0)  (_swigobj->GetScrollThumb(_swigarg0))
-static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_GetScrollThumb",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_GetScrollThumb",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1349,15 +1387,16 @@ static PyObject *_wrap_wxWindow_GetScrollThumb(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetScrollPos(_swigobj,_swigarg0)  (_swigobj->GetScrollPos(_swigarg0))
-static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_GetScrollPos",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_GetScrollPos",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1376,15 +1415,16 @@ static PyObject *_wrap_wxWindow_GetScrollPos(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetScrollRange(_swigobj,_swigarg0)  (_swigobj->GetScrollRange(_swigarg0))
-static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_GetScrollRange",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_GetScrollRange",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1403,7 +1443,7 @@ static PyObject *_wrap_wxWindow_GetScrollRange(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetSizeTuple(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
@@ -1411,6 +1451,7 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -1419,7 +1460,7 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetSizeTuple",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetSizeTuple",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1449,15 +1490,16 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetSize(_swigobj)  (_swigobj->GetSize())
-static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1477,7 +1519,7 @@ static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
@@ -1487,6 +1529,7 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
     int  temp0;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","string", NULL };
 
     self = self;
 {
@@ -1495,7 +1538,7 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
 {
   _arg3 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_GetTextExtent",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_GetTextExtent",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1536,7 +1579,7 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetFullTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
@@ -1552,6 +1595,7 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _argo6 = 0;
+    char *_kwnames[] = { "self","string","font", NULL };
 
     self = self;
 {
@@ -1566,7 +1610,7 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args
 {
   _arg5 = &temp2;
 }
-    if(!PyArg_ParseTuple(args,"OO|O:wxWindow_GetFullTextExtent",&_argo0,&_obj1,&_argo6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxWindow_GetFullTextExtent",_kwnames,&_argo0,&_obj1,&_argo6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1624,14 +1668,15 @@ static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args
 }
 
 #define wxWindow_GetTitle(_swigobj)  (_swigobj->GetTitle())
-static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetTitle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetTitle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1655,15 +1700,16 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetUpdateRegion(_swigobj)  (_swigobj->GetUpdateRegion())
-static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRegion * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetUpdateRegion",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetUpdateRegion",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1683,14 +1729,15 @@ static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_GetWindowStyleFlag(_swigobj)  (_swigobj->GetWindowStyleFlag())
-static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     long  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetWindowStyleFlag",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetWindowStyleFlag",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1709,14 +1756,15 @@ static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *arg
 }
 
 #define wxWindow_Hide(_swigobj)  (_swigobj->Hide())
-static PyObject *_wrap_wxWindow_Hide(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Hide(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_Hide",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Hide",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1735,13 +1783,14 @@ static PyObject *_wrap_wxWindow_Hide(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_InitDialog(_swigobj)  (_swigobj->InitDialog())
-static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_InitDialog",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_InitDialog",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1761,14 +1810,15 @@ static PyObject *_wrap_wxWindow_InitDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_IsEnabled(_swigobj)  (_swigobj->IsEnabled())
-static PyObject *_wrap_wxWindow_IsEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_IsEnabled",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsEnabled",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1787,14 +1837,15 @@ static PyObject *_wrap_wxWindow_IsEnabled(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_IsRetained(_swigobj)  (_swigobj->IsRetained())
-static PyObject *_wrap_wxWindow_IsRetained(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_IsRetained(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_IsRetained",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsRetained",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1813,14 +1864,15 @@ static PyObject *_wrap_wxWindow_IsRetained(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_IsShown(_swigobj)  (_swigobj->IsShown())
-static PyObject *_wrap_wxWindow_IsShown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_IsShown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_IsShown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsShown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1839,14 +1891,15 @@ static PyObject *_wrap_wxWindow_IsShown(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_IsTopLevel(_swigobj)  (_swigobj->IsTopLevel())
-static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_IsTopLevel",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_IsTopLevel",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1865,13 +1918,14 @@ static PyObject *_wrap_wxWindow_IsTopLevel(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Layout(_swigobj)  (_swigobj->Layout())
-static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_Layout",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Layout",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1891,7 +1945,7 @@ static PyObject *_wrap_wxWindow_Layout(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_LoadFromResource(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->LoadFromResource(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
@@ -1902,9 +1956,10 @@ static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args)
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "self","parent","resourceName","resourceTable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|O:wxWindow_LoadFromResource",&_argo0,&_argo1,&_obj2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|O:wxWindow_LoadFromResource",_kwnames,&_argo0,&_argo1,&_obj2,&_argo3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1948,13 +2003,14 @@ static PyObject *_wrap_wxWindow_LoadFromResource(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_Lower(_swigobj)  (_swigobj->Lower())
-static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_Lower",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Lower",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1974,15 +2030,16 @@ static PyObject *_wrap_wxWindow_Lower(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_MakeModal(_swigobj,_swigarg0)  (_swigobj->MakeModal(_swigarg0))
-static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_MakeModal",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_MakeModal",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2003,15 +2060,16 @@ static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_MoveXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Move(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxWindow_MoveXY",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxWindow_MoveXY",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2031,15 +2089,16 @@ static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Move(_swigobj,_swigarg0)  (_swigobj->Move(_swigarg0))
-static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","point", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_Move",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_Move",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2066,7 +2125,7 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_PopupMenuXY(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
@@ -2075,9 +2134,10 @@ static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args) {
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","menu","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOii:wxWindow_PopupMenuXY",&_argo0,&_argo1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxWindow_PopupMenuXY",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2103,7 +2163,7 @@ static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1)  (_swigobj->PopupMenu(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
@@ -2112,9 +2172,10 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","menu","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxWindow_PopupMenu",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_PopupMenu",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2147,13 +2208,14 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Raise(_swigobj)  (_swigobj->Raise())
-static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_Raise",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Raise",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2173,7 +2235,7 @@ static PyObject *_wrap_wxWindow_Raise(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Refresh(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Refresh(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1 = (bool ) TRUE;
@@ -2181,9 +2243,10 @@ static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","eraseBackground","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iO:wxWindow_Refresh",&_argo0,&tempbool1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iO:wxWindow_Refresh",_kwnames,&_argo0,&tempbool1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2211,13 +2274,14 @@ static PyObject *_wrap_wxWindow_Refresh(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_ReleaseMouse(_swigobj)  (_swigobj->ReleaseMouse())
-static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_ReleaseMouse",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_ReleaseMouse",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2237,16 +2301,17 @@ static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Reparent(_swigobj,_swigarg0)  (_swigobj->Reparent(_swigarg0))
-static PyObject *_wrap_wxWindow_Reparent(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Reparent(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     wxWindow * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","newParent", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_Reparent",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_Reparent",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2272,7 +2337,7 @@ static PyObject *_wrap_wxWindow_Reparent(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_ScreenToClientXY(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ScreenToClient(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int * _arg1;
@@ -2282,9 +2347,10 @@ static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args)
     PyObject * _obj1 = 0;
     int  temp0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxWindow_ScreenToClientXY",&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxWindow_ScreenToClientXY",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2322,17 +2388,18 @@ static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_ScreenToClient(_swigobj,_swigarg0)  (_swigobj->ScreenToClient(_swigarg0))
-static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_ScreenToClient",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ScreenToClient",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2359,7 +2426,7 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_ScrollWindow(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->ScrollWindow(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
@@ -2367,9 +2434,10 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
     wxRect * _arg3 = (wxRect *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "self","dx","dy","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii|O:wxWindow_ScrollWindow",&_argo0,&_arg1,&_arg2,&_argo3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|O:wxWindow_ScrollWindow",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2396,15 +2464,16 @@ static PyObject *_wrap_wxWindow_ScrollWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetAcceleratorTable(_swigobj,_swigarg0)  (_swigobj->SetAcceleratorTable(_swigarg0))
-static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxAcceleratorTable * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","accel", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetAcceleratorTable",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetAcceleratorTable",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2431,15 +2500,16 @@ static PyObject *_wrap_wxWindow_SetAcceleratorTable(PyObject *self, PyObject *ar
 }
 
 #define wxWindow_SetAutoLayout(_swigobj,_swigarg0)  (_swigobj->SetAutoLayout(_swigarg0))
-static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","autoLayout", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_SetAutoLayout",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_SetAutoLayout",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2460,15 +2530,16 @@ static PyObject *_wrap_wxWindow_SetAutoLayout(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetBackgroundColour(_swigarg0))
-static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetBackgroundColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2495,15 +2566,16 @@ static PyObject *_wrap_wxWindow_SetBackgroundColour(PyObject *self, PyObject *ar
 }
 
 #define wxWindow_SetConstraints(_swigobj,_swigarg0)  (_swigobj->SetConstraints(_swigarg0))
-static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxLayoutConstraints * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","constraints", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetConstraints",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetConstraints",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2530,13 +2602,14 @@ static PyObject *_wrap_wxWindow_SetConstraints(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetFocus(_swigobj)  (_swigobj->SetFocus())
-static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_SetFocus",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_SetFocus",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2556,15 +2629,16 @@ static PyObject *_wrap_wxWindow_SetFocus(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetFont(_swigobj,_swigarg0)  (_swigobj->SetFont(_swigarg0))
-static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2591,15 +2665,16 @@ static PyObject *_wrap_wxWindow_SetFont(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetForegroundColour(_swigobj,_swigarg0)  (_swigobj->SetForegroundColour(_swigarg0))
-static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetForegroundColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetForegroundColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2626,14 +2701,15 @@ static PyObject *_wrap_wxWindow_SetForegroundColour(PyObject *self, PyObject *ar
 }
 
 #define wxWindow_SetId(_swigobj,_swigarg0)  (_swigobj->SetId(_swigarg0))
-static PyObject *_wrap_wxWindow_SetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_SetId",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_SetId",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2653,15 +2729,16 @@ static PyObject *_wrap_wxWindow_SetId(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetName(_swigobj,_swigarg0)  (_swigobj->SetName(_swigarg0))
-static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2692,7 +2769,7 @@ static PyObject *_wrap_wxWindow_SetName(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetScrollbar(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetScrollbar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
@@ -2702,9 +2779,10 @@ static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args) {
     bool  _arg5 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool5 = (int) TRUE;
+    char *_kwnames[] = { "self","orientation","position","thumbSize","range","refresh", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiiii|i:wxWindow_SetScrollbar",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxWindow_SetScrollbar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&tempbool5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2725,7 +2803,7 @@ static PyObject *_wrap_wxWindow_SetScrollbar(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetScrollPos(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetScrollPos(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
@@ -2733,9 +2811,10 @@ static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *self, PyObject *args) {
     bool  _arg3 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool3 = (int) TRUE;
+    char *_kwnames[] = { "self","orientation","pos","refresh", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii|i:wxWindow_SetScrollPos",&_argo0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|i:wxWindow_SetScrollPos",_kwnames,&_argo0,&_arg1,&_arg2,&tempbool3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2756,7 +2835,7 @@ static PyObject *_wrap_wxWindow_SetScrollPos(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetDimensions(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->SetSize(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
@@ -2765,9 +2844,10 @@ static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args) {
     int  _arg4;
     int  _arg5 = (int ) wxSIZE_AUTO;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y","width","height","sizeFlags", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiiii|i:wxWindow_SetDimensions",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|i:wxWindow_SetDimensions",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2789,15 +2869,16 @@ static PyObject *_wrap_wxWindow_SetDimensions(PyObject *self, PyObject *args) {
 static void  wxWindow_SetSize(wxWindow *self,const wxSize & size) {
             self->SetSize(size.x, size.y);
         }
-static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetSize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetSize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2826,15 +2907,16 @@ static PyObject *_wrap_wxWindow_SetSize(PyObject *self, PyObject *args) {
 static void  wxWindow_SetPosition(wxWindow *self,const wxPoint & pos) {
             self->SetSize(pos.x, pos.y, -1, -1);
         }
-static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetPosition",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetPosition",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2861,7 +2943,7 @@ static PyObject *_wrap_wxWindow_SetPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetSizeHints(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->SetSizeHints(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1 = (int ) -1;
@@ -2871,9 +2953,10 @@ static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) {
     int  _arg5 = (int ) -1;
     int  _arg6 = (int ) -1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","minW","minH","maxW","maxH","incW","incH", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iiiiii:wxWindow_SetSizeHints",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iiiiii:wxWindow_SetSizeHints",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2893,15 +2976,16 @@ static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetClientSizeWH(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetClientSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxWindow_SetClientSizeWH",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxWindow_SetClientSizeWH",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2921,15 +3005,16 @@ static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_SetClientSize(_swigobj,_swigarg0)  (_swigobj->SetClientSize(_swigarg0))
-static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetClientSize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetClientSize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2956,15 +3041,16 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetCursor(_swigobj,_swigarg0)  (_swigobj->SetCursor(_swigarg0))
-static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxCursor * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","cursor", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetCursor",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetCursor",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2991,15 +3077,16 @@ static PyObject *_wrap_wxWindow_SetCursor(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
-static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","title", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetTitle",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetTitle",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3030,16 +3117,17 @@ static PyObject *_wrap_wxWindow_SetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))
-static PyObject *_wrap_wxWindow_Show(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","show", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxWindow_Show",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_Show",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3059,14 +3147,15 @@ static PyObject *_wrap_wxWindow_Show(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_TransferDataFromWindow(_swigobj)  (_swigobj->TransferDataFromWindow())
-static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_TransferDataFromWindow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_TransferDataFromWindow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3085,14 +3174,15 @@ static PyObject *_wrap_wxWindow_TransferDataFromWindow(PyObject *self, PyObject
 }
 
 #define wxWindow_TransferDataToWindow(_swigobj)  (_swigobj->TransferDataToWindow())
-static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_TransferDataToWindow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_TransferDataToWindow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3111,14 +3201,15 @@ static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *a
 }
 
 #define wxWindow_Validate(_swigobj)  (_swigobj->Validate())
-static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_Validate",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_Validate",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3137,15 +3228,16 @@ static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_WarpPointer(_swigobj,_swigarg0,_swigarg1)  (_swigobj->WarpPointer(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxWindow_WarpPointer",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxWindow_WarpPointer",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3165,17 +3257,18 @@ static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_ConvertDialogPointToPixels(_swigobj,_swigarg0)  (_swigobj->ConvertDialogToPixels(_swigarg0))
-static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertDialogPointToPixels",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogPointToPixels",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3202,17 +3295,18 @@ static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObj
 }
 
 #define wxWindow_ConvertDialogSizeToPixels(_swigobj,_swigarg0)  (_swigobj->ConvertDialogToPixels(_swigarg0))
-static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","sz", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertDialogSizeToPixels",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertDialogSizeToPixels",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3239,17 +3333,18 @@ static PyObject *_wrap_wxWindow_ConvertDialogSizeToPixels(PyObject *self, PyObje
 }
 
 #define wxWindow_ConvertPixelPointToDialog(_swigobj,_swigarg0)  (_swigobj->ConvertPixelsToDialog(_swigarg0))
-static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxWindow * _arg0;
     wxPoint * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pt", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertPixelPointToDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelPointToDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3276,17 +3371,18 @@ static PyObject *_wrap_wxWindow_ConvertPixelPointToDialog(PyObject *self, PyObje
 }
 
 #define wxWindow_ConvertPixelSizeToDialog(_swigobj,_swigarg0)  (_swigobj->ConvertPixelsToDialog(_swigarg0))
-static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxWindow * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","sz", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_ConvertPixelSizeToDialog",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_ConvertPixelSizeToDialog",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3313,15 +3409,16 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObjec
 }
 
 #define wxWindow_SetToolTipString(_swigobj,_swigarg0)  (_swigobj->SetToolTip(_swigarg0))
-static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","tip", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetToolTipString",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetToolTipString",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3352,15 +3449,16 @@ static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *self, PyObject *args)
 }
 
 #define wxWindow_SetToolTip(_swigobj,_swigarg0)  (_swigobj->SetToolTip(_swigarg0))
-static PyObject *_wrap_wxWindow_SetToolTip(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_SetToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _arg0;
     wxToolTip * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","tooltip", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxWindow_SetToolTip",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_SetToolTip",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3387,15 +3485,16 @@ static PyObject *_wrap_wxWindow_SetToolTip(PyObject *self, PyObject *args) {
 }
 
 #define wxWindow_GetToolTip(_swigobj)  (_swigobj->GetToolTip())
-static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxToolTip * _result;
     wxWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxWindow_GetToolTip",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetToolTip",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3436,7 +3535,7 @@ static void *SwigwxPanelTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxPanel(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxPanel(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPanel * _result;
     wxWindow * _arg0;
@@ -3448,10 +3547,11 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxPanel",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxPanel",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3490,13 +3590,14 @@ static PyObject *_wrap_new_wxPanel(PyObject *self, PyObject *args) {
 }
 
 #define wxPanel_InitDialog(_swigobj)  (_swigobj->InitDialog())
-static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPanel * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPanel_InitDialog",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPanel_InitDialog",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3516,15 +3617,16 @@ static PyObject *_wrap_wxPanel_InitDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxPanel_GetDefaultItem(_swigobj)  (_swigobj->GetDefaultItem())
-static PyObject *_wrap_wxPanel_GetDefaultItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPanel_GetDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxButton * _result;
     wxPanel * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPanel_GetDefaultItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPanel_GetDefaultItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3549,15 +3651,16 @@ static PyObject *_wrap_wxPanel_GetDefaultItem(PyObject *self, PyObject *args) {
 }
 
 #define wxPanel_SetDefaultItem(_swigobj,_swigarg0)  (_swigobj->SetDefaultItem(_swigarg0))
-static PyObject *_wrap_wxPanel_SetDefaultItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPanel_SetDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPanel * _arg0;
     wxButton * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","btn", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPanel_SetDefaultItem",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPanel_SetDefaultItem",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3608,7 +3711,7 @@ static void *SwigwxDialogTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
-static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDialog * _result;
     wxWindow * _arg0;
@@ -3622,10 +3725,11 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _argo4 = 0;
+    char *_kwnames[] = { "parent","id","title","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|OOls:new_wxDialog",&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOls:new_wxDialog",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3675,14 +3779,15 @@ static PyObject *_wrap_new_wxDialog(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_Centre(_swigobj,_swigarg0)  (_swigobj->Centre(_swigarg0))
-static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1 = (int ) wxBOTH;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","direction", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxDialog_Centre",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxDialog_Centre",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3702,14 +3807,15 @@ static PyObject *_wrap_wxDialog_Centre(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_EndModal(_swigobj,_swigarg0)  (_swigobj->EndModal(_swigarg0))
-static PyObject *_wrap_wxDialog_EndModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_EndModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","retCode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxDialog_EndModal",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_EndModal",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3729,14 +3835,15 @@ static PyObject *_wrap_wxDialog_EndModal(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_GetTitle(_swigobj)  (_swigobj->GetTitle())
-static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDialog_GetTitle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_GetTitle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3760,15 +3867,16 @@ static PyObject *_wrap_wxDialog_GetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_Iconize(_swigobj,_swigarg0)  (_swigobj->Iconize(_swigarg0))
-static PyObject *_wrap_wxDialog_Iconize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_Iconize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","iconize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxDialog_Iconize",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_Iconize",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3789,14 +3897,15 @@ static PyObject *_wrap_wxDialog_Iconize(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_IsIconized(_swigobj)  (_swigobj->IsIconized())
-static PyObject *_wrap_wxDialog_IsIconized(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_IsIconized(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDialog_IsIconized",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_IsIconized",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3815,15 +3924,16 @@ static PyObject *_wrap_wxDialog_IsIconized(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_SetModal(_swigobj,_swigarg0)  (_swigobj->SetModal(_swigarg0))
-static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxDialog_SetModal",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_SetModal",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3844,14 +3954,15 @@ static PyObject *_wrap_wxDialog_SetModal(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_IsModal(_swigobj)  (_swigobj->IsModal())
-static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDialog_IsModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_IsModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3870,15 +3981,16 @@ static PyObject *_wrap_wxDialog_IsModal(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
-static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","title", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxDialog_SetTitle",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxDialog_SetTitle",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3909,16 +4021,17 @@ static PyObject *_wrap_wxDialog_SetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_Show(_swigobj,_swigarg0)  (_swigobj->Show(_swigarg0))
-static PyObject *_wrap_wxDialog_Show(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_Show(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxDialog * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","show", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxDialog_Show",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_Show",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3938,14 +4051,15 @@ static PyObject *_wrap_wxDialog_Show(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_ShowModal(_swigobj)  (_swigobj->ShowModal())
-static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDialog_ShowModal",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_ShowModal",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3964,14 +4078,15 @@ static PyObject *_wrap_wxDialog_ShowModal(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_GetReturnCode(_swigobj)  (_swigobj->GetReturnCode())
-static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxDialog * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxDialog_GetReturnCode",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxDialog_GetReturnCode",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3990,14 +4105,15 @@ static PyObject *_wrap_wxDialog_GetReturnCode(PyObject *self, PyObject *args) {
 }
 
 #define wxDialog_SetReturnCode(_swigobj,_swigarg0)  (_swigobj->SetReturnCode(_swigarg0))
-static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxDialog_SetReturnCode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxDialog * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","retCode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxDialog_SetReturnCode",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxDialog_SetReturnCode",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4041,7 +4157,7 @@ static void *SwigwxScrolledWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxScrolledWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxScrolledWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _result;
     wxWindow * _arg0;
@@ -4053,10 +4169,11 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iOOls:new_wxScrolledWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOls:new_wxScrolledWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4095,7 +4212,7 @@ static PyObject *_wrap_new_wxScrolledWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxScrolledWindow_EnableScrolling(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableScrolling(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxScrolledWindow_EnableScrolling(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_EnableScrolling(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     bool  _arg1;
@@ -4103,9 +4220,10 @@ static PyObject *_wrap_wxScrolledWindow_EnableScrolling(PyObject *self, PyObject
     PyObject * _argo0 = 0;
     int tempbool1;
     int tempbool2;
+    char *_kwnames[] = { "self","xScrolling","yScrolling", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxScrolledWindow_EnableScrolling",&_argo0,&tempbool1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxScrolledWindow_EnableScrolling",_kwnames,&_argo0,&tempbool1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4127,7 +4245,7 @@ static PyObject *_wrap_wxScrolledWindow_EnableScrolling(PyObject *self, PyObject
 }
 
 #define wxScrolledWindow_GetScrollPixelsPerUnit(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetScrollPixelsPerUnit(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
@@ -4135,6 +4253,7 @@ static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, P
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -4143,7 +4262,7 @@ static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, P
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_GetScrollPixelsPerUnit",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_GetScrollPixelsPerUnit",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4173,7 +4292,7 @@ static PyObject *_wrap_wxScrolledWindow_GetScrollPixelsPerUnit(PyObject *self, P
 }
 
 #define wxScrolledWindow_GetVirtualSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetVirtualSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
@@ -4181,6 +4300,7 @@ static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -4189,7 +4309,7 @@ static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_GetVirtualSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_GetVirtualSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4219,14 +4339,15 @@ static PyObject *_wrap_wxScrolledWindow_GetVirtualSize(PyObject *self, PyObject
 }
 
 #define wxScrolledWindow_IsRetained(_swigobj)  (_swigobj->IsRetained())
-static PyObject *_wrap_wxScrolledWindow_IsRetained(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_IsRetained(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxScrolledWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_IsRetained",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_IsRetained",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4245,15 +4366,16 @@ static PyObject *_wrap_wxScrolledWindow_IsRetained(PyObject *self, PyObject *arg
 }
 
 #define wxScrolledWindow_PrepareDC(_swigobj,_swigarg0)  (_swigobj->PrepareDC(_swigarg0))
-static PyObject *_wrap_wxScrolledWindow_PrepareDC(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_PrepareDC(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     wxDC * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","dc", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxScrolledWindow_PrepareDC",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxScrolledWindow_PrepareDC",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4280,15 +4402,16 @@ static PyObject *_wrap_wxScrolledWindow_PrepareDC(PyObject *self, PyObject *args
 }
 
 #define wxScrolledWindow_Scroll(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Scroll(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxScrolledWindow_Scroll(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_Scroll(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxScrolledWindow_Scroll",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxScrolledWindow_Scroll",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4308,7 +4431,7 @@ static PyObject *_wrap_wxScrolledWindow_Scroll(PyObject *self, PyObject *args) {
 }
 
 #define wxScrolledWindow_SetScrollbars(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)  (_swigobj->SetScrollbars(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int  _arg1;
@@ -4318,9 +4441,10 @@ static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *
     int  _arg5 = (int ) 0;
     int  _arg6 = (int ) 0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pixelsPerUnitX","pixelsPerUnitY","noUnitsX","noUnitsY","xPos","yPos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiiii|ii:wxScrolledWindow_SetScrollbars",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiiii|ii:wxScrolledWindow_SetScrollbars",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4,&_arg5,&_arg6)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4340,7 +4464,7 @@ static PyObject *_wrap_wxScrolledWindow_SetScrollbars(PyObject *self, PyObject *
 }
 
 #define wxScrolledWindow_ViewStart(_swigobj,_swigarg0,_swigarg1)  (_swigobj->ViewStart(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrolledWindow * _arg0;
     int * _arg1;
@@ -4348,6 +4472,7 @@ static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args
     int * _arg2;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
 {
@@ -4356,7 +4481,7 @@ static PyObject *_wrap_wxScrolledWindow_ViewStart(PyObject *self, PyObject *args
 {
   _arg2 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"O:wxScrolledWindow_ViewStart",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxScrolledWindow_ViewStart",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4394,16 +4519,17 @@ static void *SwigwxMenuTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMenu(_swigarg0,_swigarg1) (new wxMenu(_swigarg0,_swigarg1))
-static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _result;
     wxString * _arg0 = (wxString *) &wxPyEmptyStr;
     long  _arg1 = (long ) 0;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "title","style", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|Ol:new_wxMenu",&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|Ol:new_wxMenu",_kwnames,&_obj0,&_arg1)) 
         return NULL;
     if (_obj0)
 {
@@ -4433,7 +4559,7 @@ static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_Append(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Append(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
@@ -4443,9 +4569,10 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
     PyObject * _obj3 = 0;
+    char *_kwnames[] = { "self","id","item","helpString","checkable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO|Oi:wxMenu_Append",&_argo0,&_arg1,&_obj2,&_obj3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|Oi:wxMenu_Append",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4488,7 +4615,7 @@ static PyObject *_wrap_wxMenu_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_AppendMenu(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->Append(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
@@ -4499,9 +4626,10 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
     PyObject * _obj2 = 0;
     PyObject * _argo3 = 0;
     PyObject * _obj4 = 0;
+    char *_kwnames[] = { "self","id","item","subMenu","helpString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiOO|O:wxMenu_AppendMenu",&_argo0,&_arg1,&_obj2,&_argo3,&_obj4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|O:wxMenu_AppendMenu",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_obj4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4551,15 +4679,16 @@ static PyObject *_wrap_wxMenu_AppendMenu(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_AppendItem(_swigobj,_swigarg0)  (_swigobj->Append(_swigarg0))
-static PyObject *_wrap_wxMenu_AppendItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_AppendItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxMenuItem * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","item", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenu_AppendItem",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenu_AppendItem",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4586,13 +4715,14 @@ static PyObject *_wrap_wxMenu_AppendItem(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_AppendSeparator(_swigobj)  (_swigobj->AppendSeparator())
-static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenu_AppendSeparator",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_AppendSeparator",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4612,13 +4742,14 @@ static PyObject *_wrap_wxMenu_AppendSeparator(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_Break(_swigobj)  (_swigobj->Break())
-static PyObject *_wrap_wxMenu_Break(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Break(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenu_Break",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_Break",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4638,16 +4769,17 @@ static PyObject *_wrap_wxMenu_Break(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenu_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","id","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxMenu_Check",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenu_Check",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4668,16 +4800,17 @@ static PyObject *_wrap_wxMenu_Check(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_Enable(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenu_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","id","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxMenu_Enable",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenu_Enable",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4698,16 +4831,17 @@ static PyObject *_wrap_wxMenu_Enable(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_FindItem(_swigobj,_swigarg0)  (_swigobj->FindItem(_swigarg0))
-static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMenu * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","itemString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenu_FindItem",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenu_FindItem",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4737,14 +4871,15 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_GetTitle(_swigobj)  (_swigobj->GetTitle())
-static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenu_GetTitle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_GetTitle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4768,15 +4903,16 @@ static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_SetTitle(_swigobj,_swigarg0)  (_swigobj->SetTitle(_swigarg0))
-static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","title", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenu_SetTitle",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenu_SetTitle",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4807,16 +4943,17 @@ static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_FindItemForId(_swigobj,_swigarg0)  (_swigobj->FindItemForId(_swigarg0))
-static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenu_FindItemForId",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_FindItemForId",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4841,15 +4978,16 @@ static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_GetHelpString(_swigobj,_swigarg0)  (_swigobj->GetHelpString(_swigarg0))
-static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenu_GetHelpString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_GetHelpString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4873,15 +5011,16 @@ static PyObject *_wrap_wxMenu_GetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
-static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenu_GetLabel",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_GetLabel",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4905,16 +5044,17 @@ static PyObject *_wrap_wxMenu_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_SetHelpString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetHelpString(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","id","helpString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxMenu_SetHelpString",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenu_SetHelpString",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4945,15 +5085,16 @@ static PyObject *_wrap_wxMenu_SetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_IsChecked(_swigobj,_swigarg0)  (_swigobj->IsChecked(_swigarg0))
-static PyObject *_wrap_wxMenu_IsChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenu_IsChecked",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_IsChecked",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4972,15 +5113,16 @@ static PyObject *_wrap_wxMenu_IsChecked(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_IsEnabled(_swigobj,_swigarg0)  (_swigobj->IsEnabled(_swigarg0))
-static PyObject *_wrap_wxMenu_IsEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenu * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenu_IsEnabled",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_IsEnabled",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4999,16 +5141,17 @@ static PyObject *_wrap_wxMenu_IsEnabled(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","id","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxMenu_SetLabel",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenu_SetLabel",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5039,15 +5182,16 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxMenu_UpdateUI(_swigobj,_swigarg0)  (_swigobj->UpdateUI(_swigarg0))
-static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _arg0;
     wxEvtHandler * _arg1 = (wxEvtHandler *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","source", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:wxMenu_UpdateUI",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxMenu_UpdateUI",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5073,6 +5217,35 @@ static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
+static void  wxMenu_Destroy(wxMenu *self) {
+            delete self;
+        }
+static PyObject *_wrap_wxMenu_Destroy(PyObject *self, PyObject *args, PyObject *kwargs) {
+    PyObject * _resultobj;
+    wxMenu * _arg0;
+    PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
+
+    self = self;
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenu_Destroy",_kwnames,&_argo0)) 
+        return NULL;
+    if (_argo0) {
+        if (_argo0 == Py_None) { _arg0 = NULL; }
+        else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {
+            PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_Destroy. Expected _wxMenu_p.");
+        return NULL;
+        }
+    }
+{
+    wxPy_BEGIN_ALLOW_THREADS;
+        wxMenu_Destroy(_arg0);
+
+    wxPy_END_ALLOW_THREADS;
+}    Py_INCREF(Py_None);
+    _resultobj = Py_None;
+    return _resultobj;
+}
+
 static void *SwigwxMenuBarTowxEvtHandler(void *ptr) {
     wxMenuBar *src;
     wxEvtHandler *dest;
@@ -5082,13 +5255,14 @@ static void *SwigwxMenuBarTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxMenuBar() (new wxMenuBar())
-static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxMenuBar")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxMenuBar",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -5106,7 +5280,7 @@ static PyObject *_wrap_new_wxMenuBar(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_Append(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Append(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     wxMenu * _arg1;
@@ -5114,9 +5288,10 @@ static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","menu","title", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxMenuBar_Append",&_argo0,&_argo1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxMenuBar_Append",_kwnames,&_argo0,&_argo1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5154,16 +5329,17 @@ static PyObject *_wrap_wxMenuBar_Append(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_Check(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Check(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","id","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxMenuBar_Check",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenuBar_Check",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5184,15 +5360,16 @@ static PyObject *_wrap_wxMenuBar_Check(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_Checked(_swigobj,_swigarg0)  (_swigobj->Checked(_swigarg0))
-static PyObject *_wrap_wxMenuBar_Checked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Checked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_Checked",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_Checked",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5211,16 +5388,17 @@ static PyObject *_wrap_wxMenuBar_Checked(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_Enable(_swigobj,_swigarg0,_swigarg1)  (_swigobj->Enable(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","id","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxMenuBar_Enable",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenuBar_Enable",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5241,15 +5419,16 @@ static PyObject *_wrap_wxMenuBar_Enable(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_Enabled(_swigobj,_swigarg0)  (_swigobj->Enabled(_swigarg0))
-static PyObject *_wrap_wxMenuBar_Enabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_Enabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_Enabled",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_Enabled",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5268,7 +5447,7 @@ static PyObject *_wrap_wxMenuBar_Enabled(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_FindMenuItem(_swigobj,_swigarg0,_swigarg1)  (_swigobj->FindMenuItem(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;
@@ -5277,9 +5456,10 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","menuString","itemString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO:wxMenuBar_FindMenuItem",&_argo0,&_obj1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO:wxMenuBar_FindMenuItem",_kwnames,&_argo0,&_obj1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5320,16 +5500,17 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_FindItemForId(_swigobj,_swigarg0)  (_swigobj->FindItemForId(_swigarg0))
-static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_FindItemForId",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_FindItemForId",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5354,16 +5535,17 @@ static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_EnableTop(_swigobj,_swigarg0,_swigarg1)  (_swigobj->EnableTop(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","pos","enable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxMenuBar_EnableTop",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxMenuBar_EnableTop",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5384,15 +5566,16 @@ static PyObject *_wrap_wxMenuBar_EnableTop(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetHelpString(_swigobj,_swigarg0)  (_swigobj->GetHelpString(_swigarg0))
-static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetHelpString",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetHelpString",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5416,15 +5599,16 @@ static PyObject *_wrap_wxMenuBar_GetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetLabel(_swigobj,_swigarg0)  (_swigobj->GetLabel(_swigarg0))
-static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","id", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetLabel",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetLabel",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5448,16 +5632,17 @@ static PyObject *_wrap_wxMenuBar_GetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_SetHelpString(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetHelpString(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","id","helpString", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxMenuBar_SetHelpString",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenuBar_SetHelpString",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5488,16 +5673,17 @@ static PyObject *_wrap_wxMenuBar_SetHelpString(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_SetLabel(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabel(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","id","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxMenuBar_SetLabel",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenuBar_SetLabel",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5528,15 +5714,16 @@ static PyObject *_wrap_wxMenuBar_SetLabel(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetLabelTop(_swigobj,_swigarg0)  (_swigobj->GetLabelTop(_swigarg0))
-static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetLabelTop",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetLabelTop",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5560,16 +5747,17 @@ static PyObject *_wrap_wxMenuBar_GetLabelTop(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_SetLabelTop(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabelTop(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuBar * _arg0;
     int  _arg1;
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","pos","label", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxMenuBar_SetLabelTop",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxMenuBar_SetLabelTop",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5600,14 +5788,15 @@ static PyObject *_wrap_wxMenuBar_SetLabelTop(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetMenuCount(_swigobj)  (_swigobj->GetMenuCount())
-static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMenuBar * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuBar_GetMenuCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuBar_GetMenuCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5626,16 +5815,17 @@ static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuBar_GetMenu(_swigobj,_swigarg0)  (_swigobj->GetMenu(_swigarg0))
-static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuBar * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","i", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuBar_GetMenu",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuBar_GetMenu",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5660,7 +5850,7 @@ static PyObject *_wrap_wxMenuBar_GetMenu(PyObject *self, PyObject *args) {
 }
 
 #define new_wxMenuItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxMenuItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _result;
     wxMenu * _arg0 = (wxMenu *) NULL;
@@ -5674,10 +5864,11 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args) {
     PyObject * _obj3 = 0;
     int tempbool4 = (int) FALSE;
     PyObject * _argo5 = 0;
+    char *_kwnames[] = { "parentMenu","id","text","helpString","checkable","subMenu", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"|OiOOiO:new_wxMenuItem",&_argo0,&_arg1,&_obj2,&_obj3,&tempbool4,&_argo5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|OiOOiO:new_wxMenuItem",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&tempbool4,&_argo5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5734,14 +5925,15 @@ static PyObject *_wrap_new_wxMenuItem(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_IsSeparator(_swigobj)  (_swigobj->IsSeparator())
-static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsSeparator",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsSeparator",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5760,14 +5952,15 @@ static PyObject *_wrap_wxMenuItem_IsSeparator(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_IsEnabled(_swigobj)  (_swigobj->IsEnabled())
-static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsEnabled",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsEnabled",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5786,14 +5979,15 @@ static PyObject *_wrap_wxMenuItem_IsEnabled(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_IsChecked(_swigobj)  (_swigobj->IsChecked())
-static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsChecked",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsChecked",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5812,14 +6006,15 @@ static PyObject *_wrap_wxMenuItem_IsChecked(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_IsCheckable(_swigobj)  (_swigobj->IsCheckable())
-static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_IsCheckable",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_IsCheckable",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5838,14 +6033,15 @@ static PyObject *_wrap_wxMenuItem_IsCheckable(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_GetId(_swigobj)  (_swigobj->GetId())
-static PyObject *_wrap_wxMenuItem_GetId(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetId(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetId",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetId",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5864,15 +6060,16 @@ static PyObject *_wrap_wxMenuItem_GetId(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_GetSubMenu(_swigobj)  (_swigobj->GetSubMenu())
-static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenu * _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetSubMenu",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetSubMenu",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5897,15 +6094,16 @@ static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_SetName(_swigobj,_swigarg0)  (_swigobj->SetName(_swigarg0))
-static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","strName", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5936,14 +6134,15 @@ static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_GetName(_swigobj)  (_swigobj->GetName())
-static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5967,14 +6166,15 @@ static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_GetHelp(_swigobj)  (_swigobj->GetHelp())
-static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetHelp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetHelp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5998,15 +6198,16 @@ static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_SetHelp(_swigobj,_swigarg0)  (_swigobj->SetHelp(_swigarg0))
-static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","strHelp", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetHelp",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetHelp",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6037,15 +6238,16 @@ static PyObject *_wrap_wxMenuItem_SetHelp(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_Enable(_swigobj,_swigarg0)  (_swigobj->Enable(_swigarg0))
-static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","bDoEnable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxMenuItem_Enable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_Enable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6066,15 +6268,16 @@ static PyObject *_wrap_wxMenuItem_Enable(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_Check(_swigobj,_swigarg0)  (_swigobj->Check(_swigarg0))
-static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","bDoCheck", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxMenuItem_Check",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_Check",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6095,15 +6298,16 @@ static PyObject *_wrap_wxMenuItem_Check(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_GetBackgroundColour(_swigobj)  (_swigobj->GetBackgroundColour())
-static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetBackgroundColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetBackgroundColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6129,17 +6333,18 @@ static PyObject *_wrap_wxMenuItem_GetBackgroundColour(PyObject *self, PyObject *
 }
 
 #define wxMenuItem_GetBitmap(_swigobj,_swigarg0)  (_swigobj->GetBitmap(_swigarg0))
-static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxMenuItem * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","checked", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxMenuItem_GetBitmap",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxMenuItem_GetBitmap",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6160,15 +6365,16 @@ static PyObject *_wrap_wxMenuItem_GetBitmap(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_GetFont(_swigobj)  (_swigobj->GetFont())
-static PyObject *_wrap_wxMenuItem_GetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6194,14 +6400,15 @@ static PyObject *_wrap_wxMenuItem_GetFont(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_GetMarginWidth(_swigobj)  (_swigobj->GetMarginWidth())
-static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetMarginWidth",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetMarginWidth",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6220,15 +6427,16 @@ static PyObject *_wrap_wxMenuItem_GetMarginWidth(PyObject *self, PyObject *args)
 }
 
 #define wxMenuItem_GetTextColour(_swigobj)  (_swigobj->GetTextColour())
-static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_GetTextColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_GetTextColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6254,15 +6462,16 @@ static PyObject *_wrap_wxMenuItem_GetTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxMenuItem_SetBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetBackgroundColour(_swigarg0))
-static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetBackgroundColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6289,7 +6498,7 @@ static PyObject *_wrap_wxMenuItem_SetBackgroundColour(PyObject *self, PyObject *
 }
 
 #define wxMenuItem_SetBitmaps(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetBitmaps(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxBitmap * _arg1;
@@ -6297,9 +6506,10 @@ static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","checked","unchecked", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|O:wxMenuItem_SetBitmaps",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxMenuItem_SetBitmaps",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6333,15 +6543,16 @@ static PyObject *_wrap_wxMenuItem_SetBitmaps(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_SetFont(_swigobj,_swigarg0)  (_swigobj->SetFont(_swigarg0))
-static PyObject *_wrap_wxMenuItem_SetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6368,14 +6579,15 @@ static PyObject *_wrap_wxMenuItem_SetFont(PyObject *self, PyObject *args) {
 }
 
 #define wxMenuItem_SetMarginWidth(_swigobj,_swigarg0)  (_swigobj->SetMarginWidth(_swigarg0))
-static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxMenuItem_SetMarginWidth",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenuItem_SetMarginWidth",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6395,15 +6607,16 @@ static PyObject *_wrap_wxMenuItem_SetMarginWidth(PyObject *self, PyObject *args)
 }
 
 #define wxMenuItem_SetTextColour(_swigobj,_swigarg0)  (_swigobj->SetTextColour(_swigarg0))
-static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxMenuItem_SetTextColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxMenuItem_SetTextColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6430,13 +6643,14 @@ static PyObject *_wrap_wxMenuItem_SetTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxMenuItem_DeleteSubMenu(_swigobj)  (_swigobj->DeleteSubMenu())
-static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxMenuItem * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxMenuItem_DeleteSubMenu",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxMenuItem_DeleteSubMenu",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -6456,193 +6670,194 @@ static PyObject *_wrap_wxMenuItem_DeleteSubMenu(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef windowscMethods[] = {
-	 { "wxMenuItem_DeleteSubMenu", _wrap_wxMenuItem_DeleteSubMenu, METH_VARARGS },
-	 { "wxMenuItem_SetTextColour", _wrap_wxMenuItem_SetTextColour, METH_VARARGS },
-	 { "wxMenuItem_SetMarginWidth", _wrap_wxMenuItem_SetMarginWidth, METH_VARARGS },
-	 { "wxMenuItem_SetFont", _wrap_wxMenuItem_SetFont, METH_VARARGS },
-	 { "wxMenuItem_SetBitmaps", _wrap_wxMenuItem_SetBitmaps, METH_VARARGS },
-	 { "wxMenuItem_SetBackgroundColour", _wrap_wxMenuItem_SetBackgroundColour, METH_VARARGS },
-	 { "wxMenuItem_GetTextColour", _wrap_wxMenuItem_GetTextColour, METH_VARARGS },
-	 { "wxMenuItem_GetMarginWidth", _wrap_wxMenuItem_GetMarginWidth, METH_VARARGS },
-	 { "wxMenuItem_GetFont", _wrap_wxMenuItem_GetFont, METH_VARARGS },
-	 { "wxMenuItem_GetBitmap", _wrap_wxMenuItem_GetBitmap, METH_VARARGS },
-	 { "wxMenuItem_GetBackgroundColour", _wrap_wxMenuItem_GetBackgroundColour, METH_VARARGS },
-	 { "wxMenuItem_Check", _wrap_wxMenuItem_Check, METH_VARARGS },
-	 { "wxMenuItem_Enable", _wrap_wxMenuItem_Enable, METH_VARARGS },
-	 { "wxMenuItem_SetHelp", _wrap_wxMenuItem_SetHelp, METH_VARARGS },
-	 { "wxMenuItem_GetHelp", _wrap_wxMenuItem_GetHelp, METH_VARARGS },
-	 { "wxMenuItem_GetName", _wrap_wxMenuItem_GetName, METH_VARARGS },
-	 { "wxMenuItem_SetName", _wrap_wxMenuItem_SetName, METH_VARARGS },
-	 { "wxMenuItem_GetSubMenu", _wrap_wxMenuItem_GetSubMenu, METH_VARARGS },
-	 { "wxMenuItem_GetId", _wrap_wxMenuItem_GetId, METH_VARARGS },
-	 { "wxMenuItem_IsCheckable", _wrap_wxMenuItem_IsCheckable, METH_VARARGS },
-	 { "wxMenuItem_IsChecked", _wrap_wxMenuItem_IsChecked, METH_VARARGS },
-	 { "wxMenuItem_IsEnabled", _wrap_wxMenuItem_IsEnabled, METH_VARARGS },
-	 { "wxMenuItem_IsSeparator", _wrap_wxMenuItem_IsSeparator, METH_VARARGS },
-	 { "new_wxMenuItem", _wrap_new_wxMenuItem, METH_VARARGS },
-	 { "wxMenuBar_GetMenu", _wrap_wxMenuBar_GetMenu, METH_VARARGS },
-	 { "wxMenuBar_GetMenuCount", _wrap_wxMenuBar_GetMenuCount, METH_VARARGS },
-	 { "wxMenuBar_SetLabelTop", _wrap_wxMenuBar_SetLabelTop, METH_VARARGS },
-	 { "wxMenuBar_GetLabelTop", _wrap_wxMenuBar_GetLabelTop, METH_VARARGS },
-	 { "wxMenuBar_SetLabel", _wrap_wxMenuBar_SetLabel, METH_VARARGS },
-	 { "wxMenuBar_SetHelpString", _wrap_wxMenuBar_SetHelpString, METH_VARARGS },
-	 { "wxMenuBar_GetLabel", _wrap_wxMenuBar_GetLabel, METH_VARARGS },
-	 { "wxMenuBar_GetHelpString", _wrap_wxMenuBar_GetHelpString, METH_VARARGS },
-	 { "wxMenuBar_EnableTop", _wrap_wxMenuBar_EnableTop, METH_VARARGS },
-	 { "wxMenuBar_FindItemForId", _wrap_wxMenuBar_FindItemForId, METH_VARARGS },
-	 { "wxMenuBar_FindMenuItem", _wrap_wxMenuBar_FindMenuItem, METH_VARARGS },
-	 { "wxMenuBar_Enabled", _wrap_wxMenuBar_Enabled, METH_VARARGS },
-	 { "wxMenuBar_Enable", _wrap_wxMenuBar_Enable, METH_VARARGS },
-	 { "wxMenuBar_Checked", _wrap_wxMenuBar_Checked, METH_VARARGS },
-	 { "wxMenuBar_Check", _wrap_wxMenuBar_Check, METH_VARARGS },
-	 { "wxMenuBar_Append", _wrap_wxMenuBar_Append, METH_VARARGS },
-	 { "new_wxMenuBar", _wrap_new_wxMenuBar, METH_VARARGS },
-	 { "wxMenu_UpdateUI", _wrap_wxMenu_UpdateUI, METH_VARARGS },
-	 { "wxMenu_SetLabel", _wrap_wxMenu_SetLabel, METH_VARARGS },
-	 { "wxMenu_IsEnabled", _wrap_wxMenu_IsEnabled, METH_VARARGS },
-	 { "wxMenu_IsChecked", _wrap_wxMenu_IsChecked, METH_VARARGS },
-	 { "wxMenu_SetHelpString", _wrap_wxMenu_SetHelpString, METH_VARARGS },
-	 { "wxMenu_GetLabel", _wrap_wxMenu_GetLabel, METH_VARARGS },
-	 { "wxMenu_GetHelpString", _wrap_wxMenu_GetHelpString, METH_VARARGS },
-	 { "wxMenu_FindItemForId", _wrap_wxMenu_FindItemForId, METH_VARARGS },
-	 { "wxMenu_SetTitle", _wrap_wxMenu_SetTitle, METH_VARARGS },
-	 { "wxMenu_GetTitle", _wrap_wxMenu_GetTitle, METH_VARARGS },
-	 { "wxMenu_FindItem", _wrap_wxMenu_FindItem, METH_VARARGS },
-	 { "wxMenu_Enable", _wrap_wxMenu_Enable, METH_VARARGS },
-	 { "wxMenu_Check", _wrap_wxMenu_Check, METH_VARARGS },
-	 { "wxMenu_Break", _wrap_wxMenu_Break, METH_VARARGS },
-	 { "wxMenu_AppendSeparator", _wrap_wxMenu_AppendSeparator, METH_VARARGS },
-	 { "wxMenu_AppendItem", _wrap_wxMenu_AppendItem, METH_VARARGS },
-	 { "wxMenu_AppendMenu", _wrap_wxMenu_AppendMenu, METH_VARARGS },
-	 { "wxMenu_Append", _wrap_wxMenu_Append, METH_VARARGS },
-	 { "new_wxMenu", _wrap_new_wxMenu, METH_VARARGS },
-	 { "wxScrolledWindow_ViewStart", _wrap_wxScrolledWindow_ViewStart, METH_VARARGS },
-	 { "wxScrolledWindow_SetScrollbars", _wrap_wxScrolledWindow_SetScrollbars, METH_VARARGS },
-	 { "wxScrolledWindow_Scroll", _wrap_wxScrolledWindow_Scroll, METH_VARARGS },
-	 { "wxScrolledWindow_PrepareDC", _wrap_wxScrolledWindow_PrepareDC, METH_VARARGS },
-	 { "wxScrolledWindow_IsRetained", _wrap_wxScrolledWindow_IsRetained, METH_VARARGS },
-	 { "wxScrolledWindow_GetVirtualSize", _wrap_wxScrolledWindow_GetVirtualSize, METH_VARARGS },
-	 { "wxScrolledWindow_GetScrollPixelsPerUnit", _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, METH_VARARGS },
-	 { "wxScrolledWindow_EnableScrolling", _wrap_wxScrolledWindow_EnableScrolling, METH_VARARGS },
-	 { "new_wxScrolledWindow", _wrap_new_wxScrolledWindow, METH_VARARGS },
-	 { "wxDialog_SetReturnCode", _wrap_wxDialog_SetReturnCode, METH_VARARGS },
-	 { "wxDialog_GetReturnCode", _wrap_wxDialog_GetReturnCode, METH_VARARGS },
-	 { "wxDialog_ShowModal", _wrap_wxDialog_ShowModal, METH_VARARGS },
-	 { "wxDialog_Show", _wrap_wxDialog_Show, METH_VARARGS },
-	 { "wxDialog_SetTitle", _wrap_wxDialog_SetTitle, METH_VARARGS },
-	 { "wxDialog_IsModal", _wrap_wxDialog_IsModal, METH_VARARGS },
-	 { "wxDialog_SetModal", _wrap_wxDialog_SetModal, METH_VARARGS },
-	 { "wxDialog_IsIconized", _wrap_wxDialog_IsIconized, METH_VARARGS },
-	 { "wxDialog_Iconize", _wrap_wxDialog_Iconize, METH_VARARGS },
-	 { "wxDialog_GetTitle", _wrap_wxDialog_GetTitle, METH_VARARGS },
-	 { "wxDialog_EndModal", _wrap_wxDialog_EndModal, METH_VARARGS },
-	 { "wxDialog_Centre", _wrap_wxDialog_Centre, METH_VARARGS },
-	 { "new_wxDialog", _wrap_new_wxDialog, METH_VARARGS },
-	 { "wxPanel_SetDefaultItem", _wrap_wxPanel_SetDefaultItem, METH_VARARGS },
-	 { "wxPanel_GetDefaultItem", _wrap_wxPanel_GetDefaultItem, METH_VARARGS },
-	 { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, METH_VARARGS },
-	 { "new_wxPanel", _wrap_new_wxPanel, METH_VARARGS },
-	 { "wxWindow_GetToolTip", _wrap_wxWindow_GetToolTip, METH_VARARGS },
-	 { "wxWindow_SetToolTip", _wrap_wxWindow_SetToolTip, METH_VARARGS },
-	 { "wxWindow_SetToolTipString", _wrap_wxWindow_SetToolTipString, METH_VARARGS },
-	 { "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, METH_VARARGS },
-	 { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, METH_VARARGS },
-	 { "wxWindow_DLG_SZE", _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS },
-	 { "wxWindow_DLG_PNT", _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS },
-	 { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS },
-	 { "wxWindow_ConvertDialogPointToPixels", _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS },
-	 { "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, METH_VARARGS },
-	 { "wxWindow_Validate", _wrap_wxWindow_Validate, METH_VARARGS },
-	 { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, METH_VARARGS },
-	 { "wxWindow_TransferDataFromWindow", _wrap_wxWindow_TransferDataFromWindow, METH_VARARGS },
-	 { "wxWindow_Show", _wrap_wxWindow_Show, METH_VARARGS },
-	 { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, METH_VARARGS },
-	 { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, METH_VARARGS },
-	 { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, METH_VARARGS },
-	 { "wxWindow_SetClientSizeWH", _wrap_wxWindow_SetClientSizeWH, METH_VARARGS },
-	 { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, METH_VARARGS },
-	 { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, METH_VARARGS },
-	 { "wxWindow_SetSize", _wrap_wxWindow_SetSize, METH_VARARGS },
-	 { "wxWindow_SetDimensions", _wrap_wxWindow_SetDimensions, METH_VARARGS },
-	 { "wxWindow_SetScrollPos", _wrap_wxWindow_SetScrollPos, METH_VARARGS },
-	 { "wxWindow_SetScrollbar", _wrap_wxWindow_SetScrollbar, METH_VARARGS },
-	 { "wxWindow_SetName", _wrap_wxWindow_SetName, METH_VARARGS },
-	 { "wxWindow_SetId", _wrap_wxWindow_SetId, METH_VARARGS },
-	 { "wxWindow_SetForegroundColour", _wrap_wxWindow_SetForegroundColour, METH_VARARGS },
-	 { "wxWindow_SetFont", _wrap_wxWindow_SetFont, METH_VARARGS },
-	 { "wxWindow_SetFocus", _wrap_wxWindow_SetFocus, METH_VARARGS },
-	 { "wxWindow_SetConstraints", _wrap_wxWindow_SetConstraints, METH_VARARGS },
-	 { "wxWindow_SetBackgroundColour", _wrap_wxWindow_SetBackgroundColour, METH_VARARGS },
-	 { "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, METH_VARARGS },
-	 { "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS },
-	 { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, METH_VARARGS },
-	 { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, METH_VARARGS },
-	 { "wxWindow_ScreenToClientXY", _wrap_wxWindow_ScreenToClientXY, METH_VARARGS },
-	 { "wxWindow_Reparent", _wrap_wxWindow_Reparent, METH_VARARGS },
-	 { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, METH_VARARGS },
-	 { "wxWindow_Refresh", _wrap_wxWindow_Refresh, METH_VARARGS },
-	 { "wxWindow_Raise", _wrap_wxWindow_Raise, METH_VARARGS },
-	 { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, METH_VARARGS },
-	 { "wxWindow_PopupMenuXY", _wrap_wxWindow_PopupMenuXY, METH_VARARGS },
-	 { "wxWindow_Move", _wrap_wxWindow_Move, METH_VARARGS },
-	 { "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, METH_VARARGS },
-	 { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, METH_VARARGS },
-	 { "wxWindow_Lower", _wrap_wxWindow_Lower, METH_VARARGS },
-	 { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, METH_VARARGS },
-	 { "wxWindow_Layout", _wrap_wxWindow_Layout, METH_VARARGS },
-	 { "wxWindow_IsTopLevel", _wrap_wxWindow_IsTopLevel, METH_VARARGS },
-	 { "wxWindow_IsShown", _wrap_wxWindow_IsShown, METH_VARARGS },
-	 { "wxWindow_IsRetained", _wrap_wxWindow_IsRetained, METH_VARARGS },
-	 { "wxWindow_IsEnabled", _wrap_wxWindow_IsEnabled, METH_VARARGS },
-	 { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, METH_VARARGS },
-	 { "wxWindow_Hide", _wrap_wxWindow_Hide, METH_VARARGS },
-	 { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, METH_VARARGS },
-	 { "wxWindow_GetUpdateRegion", _wrap_wxWindow_GetUpdateRegion, METH_VARARGS },
-	 { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, METH_VARARGS },
-	 { "wxWindow_GetFullTextExtent", _wrap_wxWindow_GetFullTextExtent, METH_VARARGS },
-	 { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, METH_VARARGS },
-	 { "wxWindow_GetSize", _wrap_wxWindow_GetSize, METH_VARARGS },
-	 { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, METH_VARARGS },
-	 { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, METH_VARARGS },
-	 { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, METH_VARARGS },
-	 { "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, METH_VARARGS },
-	 { "wxWindow_GetRect", _wrap_wxWindow_GetRect, METH_VARARGS },
-	 { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, METH_VARARGS },
-	 { "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, METH_VARARGS },
-	 { "wxWindow_GetParent", _wrap_wxWindow_GetParent, METH_VARARGS },
-	 { "wxWindow_GetName", _wrap_wxWindow_GetName, METH_VARARGS },
-	 { "wxWindow_SetLabel", _wrap_wxWindow_SetLabel, METH_VARARGS },
-	 { "wxWindow_GetLabel", _wrap_wxWindow_GetLabel, METH_VARARGS },
-	 { "wxWindow_GetId", _wrap_wxWindow_GetId, METH_VARARGS },
-	 { "wxWindow_GetGrandParent", _wrap_wxWindow_GetGrandParent, METH_VARARGS },
-	 { "wxWindow_GetForegroundColour", _wrap_wxWindow_GetForegroundColour, METH_VARARGS },
-	 { "wxWindow_GetFont", _wrap_wxWindow_GetFont, METH_VARARGS },
-	 { "wxWindow_GetConstraints", _wrap_wxWindow_GetConstraints, METH_VARARGS },
-	 { "wxWindow_GetClientSize", _wrap_wxWindow_GetClientSize, METH_VARARGS },
-	 { "wxWindow_GetClientSizeTuple", _wrap_wxWindow_GetClientSizeTuple, METH_VARARGS },
-	 { "wxWindow_GetCharWidth", _wrap_wxWindow_GetCharWidth, METH_VARARGS },
-	 { "wxWindow_GetCharHeight", _wrap_wxWindow_GetCharHeight, METH_VARARGS },
-	 { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, METH_VARARGS },
-	 { "wxWindow_Fit", _wrap_wxWindow_Fit, METH_VARARGS },
-	 { "wxWindow_FindWindowByName", _wrap_wxWindow_FindWindowByName, METH_VARARGS },
-	 { "wxWindow_FindWindowById", _wrap_wxWindow_FindWindowById, METH_VARARGS },
-	 { "wxWindow_Enable", _wrap_wxWindow_Enable, METH_VARARGS },
-	 { "wxWindow_DragAcceptFiles", _wrap_wxWindow_DragAcceptFiles, METH_VARARGS },
-	 { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, METH_VARARGS },
-	 { "wxWindow_Destroy", _wrap_wxWindow_Destroy, METH_VARARGS },
-	 { "wxWindow_Close", _wrap_wxWindow_Close, METH_VARARGS },
-	 { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, METH_VARARGS },
-	 { "wxWindow_ClientToScreenXY", _wrap_wxWindow_ClientToScreenXY, METH_VARARGS },
-	 { "wxWindow_CenterOnParent", _wrap_wxWindow_CenterOnParent, METH_VARARGS },
-	 { "wxWindow_CentreOnParent", _wrap_wxWindow_CentreOnParent, METH_VARARGS },
-	 { "wxWindow_Centre", _wrap_wxWindow_Centre, METH_VARARGS },
-	 { "wxWindow_Center", _wrap_wxWindow_Center, METH_VARARGS },
-	 { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, METH_VARARGS },
-	 { "new_wxWindow", _wrap_new_wxWindow, METH_VARARGS },
-	 { "wxEvtHandler_Connect", _wrap_wxEvtHandler_Connect, METH_VARARGS },
-	 { "wxEvtHandler_ProcessEvent", _wrap_wxEvtHandler_ProcessEvent, METH_VARARGS },
-	 { "wxWindow_FromHWND", _wrap_wxWindow_FromHWND, METH_VARARGS },
-	 { "wxWindow_FindFocus", _wrap_wxWindow_FindFocus, METH_VARARGS },
+	 { "wxMenuItem_DeleteSubMenu", (PyCFunction) _wrap_wxMenuItem_DeleteSubMenu, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_SetTextColour", (PyCFunction) _wrap_wxMenuItem_SetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_SetMarginWidth", (PyCFunction) _wrap_wxMenuItem_SetMarginWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_SetFont", (PyCFunction) _wrap_wxMenuItem_SetFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_SetBitmaps", (PyCFunction) _wrap_wxMenuItem_SetBitmaps, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_SetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetTextColour", (PyCFunction) _wrap_wxMenuItem_GetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetMarginWidth", (PyCFunction) _wrap_wxMenuItem_GetMarginWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetFont", (PyCFunction) _wrap_wxMenuItem_GetFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetBitmap", (PyCFunction) _wrap_wxMenuItem_GetBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetBackgroundColour", (PyCFunction) _wrap_wxMenuItem_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_Check", (PyCFunction) _wrap_wxMenuItem_Check, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_Enable", (PyCFunction) _wrap_wxMenuItem_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_SetHelp", (PyCFunction) _wrap_wxMenuItem_SetHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetHelp", (PyCFunction) _wrap_wxMenuItem_GetHelp, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetName", (PyCFunction) _wrap_wxMenuItem_GetName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_SetName", (PyCFunction) _wrap_wxMenuItem_SetName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetSubMenu", (PyCFunction) _wrap_wxMenuItem_GetSubMenu, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_GetId", (PyCFunction) _wrap_wxMenuItem_GetId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_IsCheckable", (PyCFunction) _wrap_wxMenuItem_IsCheckable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_IsChecked", (PyCFunction) _wrap_wxMenuItem_IsChecked, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_IsEnabled", (PyCFunction) _wrap_wxMenuItem_IsEnabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuItem_IsSeparator", (PyCFunction) _wrap_wxMenuItem_IsSeparator, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxMenuItem", (PyCFunction) _wrap_new_wxMenuItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_GetMenu", (PyCFunction) _wrap_wxMenuBar_GetMenu, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_GetMenuCount", (PyCFunction) _wrap_wxMenuBar_GetMenuCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_SetLabelTop", (PyCFunction) _wrap_wxMenuBar_SetLabelTop, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_GetLabelTop", (PyCFunction) _wrap_wxMenuBar_GetLabelTop, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_SetLabel", (PyCFunction) _wrap_wxMenuBar_SetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_SetHelpString", (PyCFunction) _wrap_wxMenuBar_SetHelpString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_GetLabel", (PyCFunction) _wrap_wxMenuBar_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_GetHelpString", (PyCFunction) _wrap_wxMenuBar_GetHelpString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_EnableTop", (PyCFunction) _wrap_wxMenuBar_EnableTop, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_FindItemForId", (PyCFunction) _wrap_wxMenuBar_FindItemForId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_FindMenuItem", (PyCFunction) _wrap_wxMenuBar_FindMenuItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_Enabled", (PyCFunction) _wrap_wxMenuBar_Enabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_Enable", (PyCFunction) _wrap_wxMenuBar_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_Checked", (PyCFunction) _wrap_wxMenuBar_Checked, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_Check", (PyCFunction) _wrap_wxMenuBar_Check, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenuBar_Append", (PyCFunction) _wrap_wxMenuBar_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxMenuBar", (PyCFunction) _wrap_new_wxMenuBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_Destroy", (PyCFunction) _wrap_wxMenu_Destroy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_UpdateUI", (PyCFunction) _wrap_wxMenu_UpdateUI, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_SetLabel", (PyCFunction) _wrap_wxMenu_SetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_IsEnabled", (PyCFunction) _wrap_wxMenu_IsEnabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_IsChecked", (PyCFunction) _wrap_wxMenu_IsChecked, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_SetHelpString", (PyCFunction) _wrap_wxMenu_SetHelpString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_GetLabel", (PyCFunction) _wrap_wxMenu_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_GetHelpString", (PyCFunction) _wrap_wxMenu_GetHelpString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_FindItemForId", (PyCFunction) _wrap_wxMenu_FindItemForId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_SetTitle", (PyCFunction) _wrap_wxMenu_SetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_GetTitle", (PyCFunction) _wrap_wxMenu_GetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_FindItem", (PyCFunction) _wrap_wxMenu_FindItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_Enable", (PyCFunction) _wrap_wxMenu_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_Check", (PyCFunction) _wrap_wxMenu_Check, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_Break", (PyCFunction) _wrap_wxMenu_Break, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_AppendSeparator", (PyCFunction) _wrap_wxMenu_AppendSeparator, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_AppendItem", (PyCFunction) _wrap_wxMenu_AppendItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_AppendMenu", (PyCFunction) _wrap_wxMenu_AppendMenu, METH_VARARGS | METH_KEYWORDS },
+	 { "wxMenu_Append", (PyCFunction) _wrap_wxMenu_Append, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxMenu", (PyCFunction) _wrap_new_wxMenu, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_ViewStart", (PyCFunction) _wrap_wxScrolledWindow_ViewStart, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_SetScrollbars", (PyCFunction) _wrap_wxScrolledWindow_SetScrollbars, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_Scroll", (PyCFunction) _wrap_wxScrolledWindow_Scroll, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_PrepareDC", (PyCFunction) _wrap_wxScrolledWindow_PrepareDC, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_IsRetained", (PyCFunction) _wrap_wxScrolledWindow_IsRetained, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_GetVirtualSize", (PyCFunction) _wrap_wxScrolledWindow_GetVirtualSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_GetScrollPixelsPerUnit", (PyCFunction) _wrap_wxScrolledWindow_GetScrollPixelsPerUnit, METH_VARARGS | METH_KEYWORDS },
+	 { "wxScrolledWindow_EnableScrolling", (PyCFunction) _wrap_wxScrolledWindow_EnableScrolling, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxScrolledWindow", (PyCFunction) _wrap_new_wxScrolledWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_SetReturnCode", (PyCFunction) _wrap_wxDialog_SetReturnCode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_GetReturnCode", (PyCFunction) _wrap_wxDialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_ShowModal", (PyCFunction) _wrap_wxDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_Show", (PyCFunction) _wrap_wxDialog_Show, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_SetTitle", (PyCFunction) _wrap_wxDialog_SetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_IsModal", (PyCFunction) _wrap_wxDialog_IsModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_SetModal", (PyCFunction) _wrap_wxDialog_SetModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_IsIconized", (PyCFunction) _wrap_wxDialog_IsIconized, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_Iconize", (PyCFunction) _wrap_wxDialog_Iconize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_GetTitle", (PyCFunction) _wrap_wxDialog_GetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_EndModal", (PyCFunction) _wrap_wxDialog_EndModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxDialog_Centre", (PyCFunction) _wrap_wxDialog_Centre, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxDialog", (PyCFunction) _wrap_new_wxDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPanel_SetDefaultItem", (PyCFunction) _wrap_wxPanel_SetDefaultItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPanel_GetDefaultItem", (PyCFunction) _wrap_wxPanel_GetDefaultItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPanel_InitDialog", (PyCFunction) _wrap_wxPanel_InitDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetToolTip", (PyCFunction) _wrap_wxWindow_GetToolTip, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetToolTip", (PyCFunction) _wrap_wxWindow_SetToolTip, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetToolTipString", (PyCFunction) _wrap_wxWindow_SetToolTipString, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ConvertPixelSizeToDialog", (PyCFunction) _wrap_wxWindow_ConvertPixelSizeToDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ConvertPixelPointToDialog", (PyCFunction) _wrap_wxWindow_ConvertPixelPointToDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_DLG_SZE", (PyCFunction) _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_DLG_PNT", (PyCFunction) _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ConvertDialogSizeToPixels", (PyCFunction) _wrap_wxWindow_ConvertDialogSizeToPixels, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ConvertDialogPointToPixels", (PyCFunction) _wrap_wxWindow_ConvertDialogPointToPixels, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_WarpPointer", (PyCFunction) _wrap_wxWindow_WarpPointer, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Validate", (PyCFunction) _wrap_wxWindow_Validate, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_TransferDataToWindow", (PyCFunction) _wrap_wxWindow_TransferDataToWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_TransferDataFromWindow", (PyCFunction) _wrap_wxWindow_TransferDataFromWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Show", (PyCFunction) _wrap_wxWindow_Show, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetTitle", (PyCFunction) _wrap_wxWindow_SetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetCursor", (PyCFunction) _wrap_wxWindow_SetCursor, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetClientSize", (PyCFunction) _wrap_wxWindow_SetClientSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetClientSizeWH", (PyCFunction) _wrap_wxWindow_SetClientSizeWH, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetSizeHints", (PyCFunction) _wrap_wxWindow_SetSizeHints, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetPosition", (PyCFunction) _wrap_wxWindow_SetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetSize", (PyCFunction) _wrap_wxWindow_SetSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetDimensions", (PyCFunction) _wrap_wxWindow_SetDimensions, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetScrollPos", (PyCFunction) _wrap_wxWindow_SetScrollPos, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetScrollbar", (PyCFunction) _wrap_wxWindow_SetScrollbar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetName", (PyCFunction) _wrap_wxWindow_SetName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetId", (PyCFunction) _wrap_wxWindow_SetId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetForegroundColour", (PyCFunction) _wrap_wxWindow_SetForegroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetFont", (PyCFunction) _wrap_wxWindow_SetFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetFocus", (PyCFunction) _wrap_wxWindow_SetFocus, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetConstraints", (PyCFunction) _wrap_wxWindow_SetConstraints, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetBackgroundColour", (PyCFunction) _wrap_wxWindow_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetAutoLayout", (PyCFunction) _wrap_wxWindow_SetAutoLayout, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ScrollWindow", (PyCFunction) _wrap_wxWindow_ScrollWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ScreenToClient", (PyCFunction) _wrap_wxWindow_ScreenToClient, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ScreenToClientXY", (PyCFunction) _wrap_wxWindow_ScreenToClientXY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Reparent", (PyCFunction) _wrap_wxWindow_Reparent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ReleaseMouse", (PyCFunction) _wrap_wxWindow_ReleaseMouse, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Refresh", (PyCFunction) _wrap_wxWindow_Refresh, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Raise", (PyCFunction) _wrap_wxWindow_Raise, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_PopupMenu", (PyCFunction) _wrap_wxWindow_PopupMenu, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_PopupMenuXY", (PyCFunction) _wrap_wxWindow_PopupMenuXY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Move", (PyCFunction) _wrap_wxWindow_Move, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_MoveXY", (PyCFunction) _wrap_wxWindow_MoveXY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_MakeModal", (PyCFunction) _wrap_wxWindow_MakeModal, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Lower", (PyCFunction) _wrap_wxWindow_Lower, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_LoadFromResource", (PyCFunction) _wrap_wxWindow_LoadFromResource, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Layout", (PyCFunction) _wrap_wxWindow_Layout, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_IsTopLevel", (PyCFunction) _wrap_wxWindow_IsTopLevel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_IsShown", (PyCFunction) _wrap_wxWindow_IsShown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_IsRetained", (PyCFunction) _wrap_wxWindow_IsRetained, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_IsEnabled", (PyCFunction) _wrap_wxWindow_IsEnabled, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_InitDialog", (PyCFunction) _wrap_wxWindow_InitDialog, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Hide", (PyCFunction) _wrap_wxWindow_Hide, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetWindowStyleFlag", (PyCFunction) _wrap_wxWindow_GetWindowStyleFlag, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetUpdateRegion", (PyCFunction) _wrap_wxWindow_GetUpdateRegion, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetTitle", (PyCFunction) _wrap_wxWindow_GetTitle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetFullTextExtent", (PyCFunction) _wrap_wxWindow_GetFullTextExtent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetTextExtent", (PyCFunction) _wrap_wxWindow_GetTextExtent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetSize", (PyCFunction) _wrap_wxWindow_GetSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetSizeTuple", (PyCFunction) _wrap_wxWindow_GetSizeTuple, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetScrollRange", (PyCFunction) _wrap_wxWindow_GetScrollRange, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetScrollPos", (PyCFunction) _wrap_wxWindow_GetScrollPos, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetScrollThumb", (PyCFunction) _wrap_wxWindow_GetScrollThumb, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetRect", (PyCFunction) _wrap_wxWindow_GetRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetPosition", (PyCFunction) _wrap_wxWindow_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetPositionTuple", (PyCFunction) _wrap_wxWindow_GetPositionTuple, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetParent", (PyCFunction) _wrap_wxWindow_GetParent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetName", (PyCFunction) _wrap_wxWindow_GetName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_SetLabel", (PyCFunction) _wrap_wxWindow_SetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetLabel", (PyCFunction) _wrap_wxWindow_GetLabel, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetId", (PyCFunction) _wrap_wxWindow_GetId, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetGrandParent", (PyCFunction) _wrap_wxWindow_GetGrandParent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetForegroundColour", (PyCFunction) _wrap_wxWindow_GetForegroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetFont", (PyCFunction) _wrap_wxWindow_GetFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetConstraints", (PyCFunction) _wrap_wxWindow_GetConstraints, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetClientSize", (PyCFunction) _wrap_wxWindow_GetClientSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetClientSizeTuple", (PyCFunction) _wrap_wxWindow_GetClientSizeTuple, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetCharWidth", (PyCFunction) _wrap_wxWindow_GetCharWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetCharHeight", (PyCFunction) _wrap_wxWindow_GetCharHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_GetBackgroundColour", (PyCFunction) _wrap_wxWindow_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Fit", (PyCFunction) _wrap_wxWindow_Fit, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_FindWindowByName", (PyCFunction) _wrap_wxWindow_FindWindowByName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_FindWindowById", (PyCFunction) _wrap_wxWindow_FindWindowById, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Enable", (PyCFunction) _wrap_wxWindow_Enable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_DragAcceptFiles", (PyCFunction) _wrap_wxWindow_DragAcceptFiles, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_DestroyChildren", (PyCFunction) _wrap_wxWindow_DestroyChildren, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Destroy", (PyCFunction) _wrap_wxWindow_Destroy, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Close", (PyCFunction) _wrap_wxWindow_Close, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ClientToScreen", (PyCFunction) _wrap_wxWindow_ClientToScreen, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_ClientToScreenXY", (PyCFunction) _wrap_wxWindow_ClientToScreenXY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_CenterOnParent", (PyCFunction) _wrap_wxWindow_CenterOnParent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_CentreOnParent", (PyCFunction) _wrap_wxWindow_CentreOnParent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Centre", (PyCFunction) _wrap_wxWindow_Centre, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_Center", (PyCFunction) _wrap_wxWindow_Center, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_CaptureMouse", (PyCFunction) _wrap_wxWindow_CaptureMouse, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxWindow", (PyCFunction) _wrap_new_wxWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvtHandler_Connect", (PyCFunction) _wrap_wxEvtHandler_Connect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxEvtHandler_ProcessEvent", (PyCFunction) _wrap_wxEvtHandler_ProcessEvent, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_FromHWND", (PyCFunction) _wrap_wxWindow_FromHWND, METH_VARARGS | METH_KEYWORDS },
+	 { "wxWindow_FindFocus", (PyCFunction) _wrap_wxWindow_FindFocus, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/windows.py b/utils/wxPython/src/msw/windows.py
index 8ae94d6bb0..bb24768aee 100644
--- a/utils/wxPython/src/msw/windows.py
+++ b/utils/wxPython/src/msw/windows.py
@@ -544,6 +544,9 @@ class wxMenuPtr(wxEvtHandlerPtr):
     def UpdateUI(self, *_args, **_kwargs):
         val = apply(windowsc.wxMenu_UpdateUI,(self,) + _args, _kwargs)
         return val
+    def Destroy(self, *_args, **_kwargs):
+        val = apply(windowsc.wxMenu_Destroy,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxMenu instance at %s>" % (self.this,)
 class wxMenu(wxMenuPtr):
diff --git a/utils/wxPython/src/msw/windows2.cpp b/utils/wxPython/src/msw/windows2.cpp
index cde65a1651..179cd19ec6 100644
--- a/utils/wxPython/src/msw/windows2.cpp
+++ b/utils/wxPython/src/msw/windows2.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -124,13 +124,14 @@ static char* wxStringErrorMsg = "string type is required for parameter";
 extern "C" {
 #endif
 #define new_wxGridCell() (new wxGridCell())
-static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxGridCell")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxGridCell",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -148,13 +149,14 @@ static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxGridCell(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxGridCell(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxGridCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxGridCell",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxGridCell",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -174,14 +176,15 @@ static PyObject *_wrap_delete_wxGridCell(PyObject *self, PyObject *args) {
 }
 
 #define wxGridCell_GetTextValue(_swigobj)  (_swigobj->GetTextValue())
-static PyObject *_wrap_wxGridCell_GetTextValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_GetTextValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetTextValue",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCell_GetTextValue",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -203,15 +206,16 @@ static PyObject *_wrap_wxGridCell_GetTextValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGridCell_SetTextValue(_swigobj,_swigarg0)  (_swigobj->SetTextValue(_swigarg0))
-static PyObject *_wrap_wxGridCell_SetTextValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_SetTextValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","str", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetTextValue",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridCell_SetTextValue",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -242,15 +246,16 @@ static PyObject *_wrap_wxGridCell_SetTextValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGridCell_GetFont(_swigobj)  (_swigobj->GetFont())
-static PyObject *_wrap_wxGridCell_GetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_GetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCell_GetFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -276,15 +281,16 @@ static PyObject *_wrap_wxGridCell_GetFont(PyObject *self, PyObject *args) {
 }
 
 #define wxGridCell_SetFont(_swigobj,_swigarg0)  (_swigobj->SetFont(_swigarg0))
-static PyObject *_wrap_wxGridCell_SetFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_SetFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","f", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridCell_SetFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -311,15 +317,16 @@ static PyObject *_wrap_wxGridCell_SetFont(PyObject *self, PyObject *args) {
 }
 
 #define wxGridCell_GetTextColour(_swigobj)  (_swigobj->GetTextColour())
-static PyObject *_wrap_wxGridCell_GetTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetTextColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCell_GetTextColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -345,15 +352,16 @@ static PyObject *_wrap_wxGridCell_GetTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxGridCell_SetTextColour(_swigobj,_swigarg0)  (_swigobj->SetTextColour(_swigarg0))
-static PyObject *_wrap_wxGridCell_SetTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_SetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetTextColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridCell_SetTextColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -380,15 +388,16 @@ static PyObject *_wrap_wxGridCell_SetTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxGridCell_GetBackgroundColour(_swigobj)  (_swigobj->GetBackgroundColour())
-static PyObject *_wrap_wxGridCell_GetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_GetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetBackgroundColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCell_GetBackgroundColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -414,15 +423,16 @@ static PyObject *_wrap_wxGridCell_GetBackgroundColour(PyObject *self, PyObject *
 }
 
 #define wxGridCell_SetBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetBackgroundColour(_swigarg0))
-static PyObject *_wrap_wxGridCell_SetBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetBackgroundColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridCell_SetBackgroundColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -449,15 +459,16 @@ static PyObject *_wrap_wxGridCell_SetBackgroundColour(PyObject *self, PyObject *
 }
 
 #define wxGridCell_GetBackgroundBrush(_swigobj)  (_swigobj->GetBackgroundBrush())
-static PyObject *_wrap_wxGridCell_GetBackgroundBrush(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_GetBackgroundBrush(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBrush * _result;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetBackgroundBrush",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCell_GetBackgroundBrush",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -483,14 +494,15 @@ static PyObject *_wrap_wxGridCell_GetBackgroundBrush(PyObject *self, PyObject *a
 }
 
 #define wxGridCell_GetAlignment(_swigobj)  (_swigobj->GetAlignment())
-static PyObject *_wrap_wxGridCell_GetAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetAlignment",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCell_GetAlignment",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -509,14 +521,15 @@ static PyObject *_wrap_wxGridCell_GetAlignment(PyObject *self, PyObject *args) {
 }
 
 #define wxGridCell_SetAlignment(_swigobj,_swigarg0)  (_swigobj->SetAlignment(_swigarg0))
-static PyObject *_wrap_wxGridCell_SetAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","align", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGridCell_SetAlignment",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridCell_SetAlignment",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -536,15 +549,16 @@ static PyObject *_wrap_wxGridCell_SetAlignment(PyObject *self, PyObject *args) {
 }
 
 #define wxGridCell_GetCellBitmap(_swigobj)  (_swigobj->GetCellBitmap())
-static PyObject *_wrap_wxGridCell_GetCellBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_GetCellBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxBitmap * _result;
     wxGridCell * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridCell_GetCellBitmap",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCell_GetCellBitmap",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -569,15 +583,16 @@ static PyObject *_wrap_wxGridCell_GetCellBitmap(PyObject *self, PyObject *args)
 }
 
 #define wxGridCell_SetCellBitmap(_swigobj,_swigarg0)  (_swigobj->SetCellBitmap(_swigarg0))
-static PyObject *_wrap_wxGridCell_SetCellBitmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridCell_SetCellBitmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _arg0;
     wxBitmap * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","bitmap", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGridCell_SetCellBitmap",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridCell_SetCellBitmap",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -628,7 +643,7 @@ static void *SwigwxGridTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxGrid(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxGrid(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _result;
     wxWindow * _arg0;
@@ -640,10 +655,11 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxGrid",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxGrid",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -682,13 +698,14 @@ static PyObject *_wrap_new_wxGrid(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_AdjustScrollbars(_swigobj)  (_swigobj->AdjustScrollbars())
-static PyObject *_wrap_wxGrid_AdjustScrollbars(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_AdjustScrollbars(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_AdjustScrollbars",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_AdjustScrollbars",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -708,7 +725,7 @@ static PyObject *_wrap_wxGrid_AdjustScrollbars(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_AppendCols(_swigobj,_swigarg0,_swigarg1)  (_swigobj->AppendCols(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_AppendCols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_AppendCols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -716,9 +733,10 @@ static PyObject *_wrap_wxGrid_AppendCols(PyObject *self, PyObject *args) {
     bool  _arg2 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","n","updateLabels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|ii:wxGrid_AppendCols",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:wxGrid_AppendCols",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -738,7 +756,7 @@ static PyObject *_wrap_wxGrid_AppendCols(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_AppendRows(_swigobj,_swigarg0,_swigarg1)  (_swigobj->AppendRows(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -746,9 +764,10 @@ static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args) {
     bool  _arg2 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool2 = (int) TRUE;
+    char *_kwnames[] = { "self","n","updateLabels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|ii:wxGrid_AppendRows",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ii:wxGrid_AppendRows",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -768,13 +787,14 @@ static PyObject *_wrap_wxGrid_AppendRows(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_BeginBatch(_swigobj)  (_swigobj->BeginBatch())
-static PyObject *_wrap_wxGrid_BeginBatch(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_BeginBatch(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_BeginBatch",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_BeginBatch",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -794,7 +814,7 @@ static PyObject *_wrap_wxGrid_BeginBatch(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_CellHitTest(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->CellHitTest(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxGrid_CellHitTest(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_CellHitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -805,6 +825,7 @@ static PyObject *_wrap_wxGrid_CellHitTest(PyObject *self, PyObject *args) {
     int * _arg4;
     int  temp0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","x","y", NULL };
 
     self = self;
 {
@@ -813,7 +834,7 @@ static PyObject *_wrap_wxGrid_CellHitTest(PyObject *self, PyObject *args) {
 {
   _arg4 = &temp0;
 }
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_CellHitTest",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_CellHitTest",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -845,7 +866,7 @@ static bool  wxGrid_CreateGrid(wxGrid *self,int  rows,int  cols,short  defaultWi
             return self->CreateGrid(rows, cols, NULL, NULL,
                                     defaultWidth, defaultHeight);
         }
-static PyObject *_wrap_wxGrid_CreateGrid(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_CreateGrid(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -854,9 +875,10 @@ static PyObject *_wrap_wxGrid_CreateGrid(PyObject *self, PyObject *args) {
     short  _arg3 = (short ) wxGRID_DEFAULT_CELL_WIDTH;
     short  _arg4 = (short ) wxGRID_DEFAULT_CELL_HEIGHT;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","rows","cols","defaultWidth","defaultHeight", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii|hh:wxGrid_CreateGrid",&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii|hh:wxGrid_CreateGrid",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -875,14 +897,15 @@ static PyObject *_wrap_wxGrid_CreateGrid(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_CurrentCellVisible(_swigobj)  (_swigobj->CurrentCellVisible())
-static PyObject *_wrap_wxGrid_CurrentCellVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_CurrentCellVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_CurrentCellVisible",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_CurrentCellVisible",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -901,7 +924,7 @@ static PyObject *_wrap_wxGrid_CurrentCellVisible(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_DeleteCols(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->DeleteCols(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_DeleteCols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_DeleteCols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -910,9 +933,10 @@ static PyObject *_wrap_wxGrid_DeleteCols(PyObject *self, PyObject *args) {
     bool  _arg3 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool3 = (int) TRUE;
+    char *_kwnames[] = { "self","pos","n","updateLabels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_DeleteCols",&_argo0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iii:wxGrid_DeleteCols",_kwnames,&_argo0,&_arg1,&_arg2,&tempbool3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -932,7 +956,7 @@ static PyObject *_wrap_wxGrid_DeleteCols(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_DeleteRows(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->DeleteRows(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -941,9 +965,10 @@ static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args) {
     bool  _arg3 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool3 = (int) TRUE;
+    char *_kwnames[] = { "self","pos","n","updateLabels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_DeleteRows",&_argo0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iii:wxGrid_DeleteRows",_kwnames,&_argo0,&_arg1,&_arg2,&tempbool3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -963,13 +988,14 @@ static PyObject *_wrap_wxGrid_DeleteRows(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_EndBatch(_swigobj)  (_swigobj->EndBatch())
-static PyObject *_wrap_wxGrid_EndBatch(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_EndBatch(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_EndBatch",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_EndBatch",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -989,14 +1015,15 @@ static PyObject *_wrap_wxGrid_EndBatch(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetBatchCount(_swigobj)  (_swigobj->GetBatchCount())
-static PyObject *_wrap_wxGrid_GetBatchCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetBatchCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetBatchCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetBatchCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1015,17 +1042,18 @@ static PyObject *_wrap_wxGrid_GetBatchCount(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetCell(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetCell(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_GetCell(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCell",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetCell",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1050,16 +1078,17 @@ static PyObject *_wrap_wxGrid_GetCell(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetCellAlignment(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetCellAlignment(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellAlignment",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetCellAlignment",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1078,14 +1107,15 @@ static PyObject *_wrap_wxGrid_GetCellAlignment(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetDefCellAlignment(_swigobj)  (_swigobj->GetCellAlignment())
-static PyObject *_wrap_wxGrid_GetDefCellAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetDefCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellAlignment",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetDefCellAlignment",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1104,17 +1134,18 @@ static PyObject *_wrap_wxGrid_GetDefCellAlignment(PyObject *self, PyObject *args
 }
 
 #define wxGrid_GetCellBackgroundColour(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetCellBackgroundColour(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_GetCellBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellBackgroundColour",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetCellBackgroundColour",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1140,15 +1171,16 @@ static PyObject *_wrap_wxGrid_GetCellBackgroundColour(PyObject *self, PyObject *
 }
 
 #define wxGrid_GetDefCellBackgroundColour(_swigobj)  (_swigobj->GetCellBackgroundColour())
-static PyObject *_wrap_wxGrid_GetDefCellBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetDefCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellBackgroundColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetDefCellBackgroundColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1199,14 +1231,15 @@ static PyObject * wxGrid_GetCells(wxGrid *self) {
             }
             return rows;
         }
-static PyObject *_wrap_wxGrid_GetCells(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCells(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCells",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCells",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1227,17 +1260,18 @@ static PyObject *_wrap_wxGrid_GetCells(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetCellTextColour(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetCellTextColour(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellTextColour",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetCellTextColour",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1263,15 +1297,16 @@ static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_GetDefCellTextColour(_swigobj)  (_swigobj->GetCellTextColour())
-static PyObject *_wrap_wxGrid_GetDefCellTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetDefCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellTextColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetDefCellTextColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1297,17 +1332,18 @@ static PyObject *_wrap_wxGrid_GetDefCellTextColour(PyObject *self, PyObject *arg
 }
 
 #define wxGrid_GetCellTextFont(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetCellTextFont(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_GetCellTextFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCellTextFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellTextFont",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetCellTextFont",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1333,15 +1369,16 @@ static PyObject *_wrap_wxGrid_GetCellTextFont(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetDefCellTextFont(_swigobj)  (_swigobj->GetCellTextFont())
-static PyObject *_wrap_wxGrid_GetDefCellTextFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetDefCellTextFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetDefCellTextFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetDefCellTextFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1367,16 +1404,17 @@ static PyObject *_wrap_wxGrid_GetDefCellTextFont(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_GetCellValue(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetCellValue(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_GetCellValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCellValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetCellValue",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetCellValue",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1398,14 +1436,15 @@ static PyObject *_wrap_wxGrid_GetCellValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetCols(_swigobj)  (_swigobj->GetCols())
-static PyObject *_wrap_wxGrid_GetCols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCols",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCols",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1424,15 +1463,16 @@ static PyObject *_wrap_wxGrid_GetCols(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetColumnWidth(_swigobj,_swigarg0)  (_swigobj->GetColumnWidth(_swigarg0))
-static PyObject *_wrap_wxGrid_GetColumnWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetColumnWidth",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_GetColumnWidth",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1451,15 +1491,16 @@ static PyObject *_wrap_wxGrid_GetColumnWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetCurrentRect(_swigobj)  (_swigobj->GetCurrentRect())
-static PyObject *_wrap_wxGrid_GetCurrentRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCurrentRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCurrentRect",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCurrentRect",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1479,14 +1520,15 @@ static PyObject *_wrap_wxGrid_GetCurrentRect(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetCursorColumn(_swigobj)  (_swigobj->GetCursorColumn())
-static PyObject *_wrap_wxGrid_GetCursorColumn(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCursorColumn(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCursorColumn",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCursorColumn",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1505,14 +1547,15 @@ static PyObject *_wrap_wxGrid_GetCursorColumn(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetCursorRow(_swigobj)  (_swigobj->GetCursorRow())
-static PyObject *_wrap_wxGrid_GetCursorRow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetCursorRow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetCursorRow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetCursorRow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1531,14 +1574,15 @@ static PyObject *_wrap_wxGrid_GetCursorRow(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetEditable(_swigobj)  (_swigobj->GetEditable())
-static PyObject *_wrap_wxGrid_GetEditable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetEditable",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetEditable",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1557,15 +1601,16 @@ static PyObject *_wrap_wxGrid_GetEditable(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetHorizScrollBar(_swigobj)  (_swigobj->GetHorizScrollBar())
-static PyObject *_wrap_wxGrid_GetHorizScrollBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetHorizScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetHorizScrollBar",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetHorizScrollBar",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1590,15 +1635,16 @@ static PyObject *_wrap_wxGrid_GetHorizScrollBar(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_GetLabelAlignment(_swigobj,_swigarg0)  (_swigobj->GetLabelAlignment(_swigarg0))
-static PyObject *_wrap_wxGrid_GetLabelAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetLabelAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetLabelAlignment",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_GetLabelAlignment",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1617,15 +1663,16 @@ static PyObject *_wrap_wxGrid_GetLabelAlignment(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_GetLabelBackgroundColour(_swigobj)  (_swigobj->GetLabelBackgroundColour())
-static PyObject *_wrap_wxGrid_GetLabelBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetLabelBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetLabelBackgroundColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetLabelBackgroundColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1651,15 +1698,16 @@ static PyObject *_wrap_wxGrid_GetLabelBackgroundColour(PyObject *self, PyObject
 }
 
 #define wxGrid_GetLabelSize(_swigobj,_swigarg0)  (_swigobj->GetLabelSize(_swigarg0))
-static PyObject *_wrap_wxGrid_GetLabelSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetLabelSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_GetLabelSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1678,15 +1726,16 @@ static PyObject *_wrap_wxGrid_GetLabelSize(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetLabelTextColour(_swigobj)  (_swigobj->GetLabelTextColour())
-static PyObject *_wrap_wxGrid_GetLabelTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetLabelTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxColour * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetLabelTextColour",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetLabelTextColour",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1712,15 +1761,16 @@ static PyObject *_wrap_wxGrid_GetLabelTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_GetLabelTextFont(_swigobj)  (_swigobj->GetLabelTextFont())
-static PyObject *_wrap_wxGrid_GetLabelTextFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetLabelTextFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxFont * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetLabelTextFont",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetLabelTextFont",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1746,16 +1796,17 @@ static PyObject *_wrap_wxGrid_GetLabelTextFont(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetLabelValue(_swigobj,_swigarg0,_swigarg1)  (_swigobj->GetLabelValue(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_GetLabelValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_GetLabelValue",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_GetLabelValue",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1777,15 +1828,16 @@ static PyObject *_wrap_wxGrid_GetLabelValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetRowHeight(_swigobj,_swigarg0)  (_swigobj->GetRowHeight(_swigarg0))
-static PyObject *_wrap_wxGrid_GetRowHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetRowHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGrid_GetRowHeight",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_GetRowHeight",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1804,14 +1856,15 @@ static PyObject *_wrap_wxGrid_GetRowHeight(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetRows(_swigobj)  (_swigobj->GetRows())
-static PyObject *_wrap_wxGrid_GetRows(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetRows(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetRows",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetRows",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1830,14 +1883,15 @@ static PyObject *_wrap_wxGrid_GetRows(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetScrollPosX(_swigobj)  (_swigobj->GetScrollPosX())
-static PyObject *_wrap_wxGrid_GetScrollPosX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetScrollPosX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetScrollPosX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetScrollPosX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1856,14 +1910,15 @@ static PyObject *_wrap_wxGrid_GetScrollPosX(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetScrollPosY(_swigobj)  (_swigobj->GetScrollPosY())
-static PyObject *_wrap_wxGrid_GetScrollPosY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetScrollPosY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetScrollPosY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetScrollPosY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1882,15 +1937,16 @@ static PyObject *_wrap_wxGrid_GetScrollPosY(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetTextItem(_swigobj)  (_swigobj->GetTextItem())
-static PyObject *_wrap_wxGrid_GetTextItem(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetTextItem(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTextCtrl * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetTextItem",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetTextItem",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1915,15 +1971,16 @@ static PyObject *_wrap_wxGrid_GetTextItem(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetVertScrollBar(_swigobj)  (_swigobj->GetVertScrollBar())
-static PyObject *_wrap_wxGrid_GetVertScrollBar(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetVertScrollBar(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxScrollBar * _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetVertScrollBar",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetVertScrollBar",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1948,7 +2005,7 @@ static PyObject *_wrap_wxGrid_GetVertScrollBar(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_InsertCols(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->InsertCols(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_InsertCols(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_InsertCols(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -1957,9 +2014,10 @@ static PyObject *_wrap_wxGrid_InsertCols(PyObject *self, PyObject *args) {
     bool  _arg3 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool3 = (int) TRUE;
+    char *_kwnames[] = { "self","pos","n","updateLabels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_InsertCols",&_argo0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iii:wxGrid_InsertCols",_kwnames,&_argo0,&_arg1,&_arg2,&tempbool3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1979,7 +2037,7 @@ static PyObject *_wrap_wxGrid_InsertCols(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_InsertRows(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->InsertRows(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
@@ -1988,9 +2046,10 @@ static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args) {
     bool  _arg3 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool3 = (int) TRUE;
+    char *_kwnames[] = { "self","pos","n","updateLabels", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|iii:wxGrid_InsertRows",&_argo0,&_arg1,&_arg2,&tempbool3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iii:wxGrid_InsertRows",_kwnames,&_argo0,&_arg1,&_arg2,&tempbool3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2010,15 +2069,16 @@ static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_OnActivate(_swigobj,_swigarg0)  (_swigobj->OnActivate(_swigarg0))
-static PyObject *_wrap_wxGrid_OnActivate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_OnActivate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","active", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGrid_OnActivate",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_OnActivate",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2039,16 +2099,17 @@ static PyObject *_wrap_wxGrid_OnActivate(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetCellAlignment(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetCellAlignment(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     int  _arg3;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","alignment","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oiii:wxGrid_SetCellAlignment",&_argo0,&_arg1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxGrid_SetCellAlignment",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2068,14 +2129,15 @@ static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetDefCellAlignment(_swigobj,_swigarg0)  (_swigobj->SetCellAlignment(_swigarg0))
-static PyObject *_wrap_wxGrid_SetDefCellAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetDefCellAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","alignment", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGrid_SetDefCellAlignment",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetDefCellAlignment",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2095,7 +2157,7 @@ static PyObject *_wrap_wxGrid_SetDefCellAlignment(PyObject *self, PyObject *args
 }
 
 #define wxGrid_SetCellBackgroundColour(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetCellBackgroundColour(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_SetCellBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
@@ -2103,9 +2165,10 @@ static PyObject *_wrap_wxGrid_SetCellBackgroundColour(PyObject *self, PyObject *
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellBackgroundColour",&_argo0,&_argo1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxGrid_SetCellBackgroundColour",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2132,15 +2195,16 @@ static PyObject *_wrap_wxGrid_SetCellBackgroundColour(PyObject *self, PyObject *
 }
 
 #define wxGrid_SetDefCellBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetCellBackgroundColour(_swigarg0))
-static PyObject *_wrap_wxGrid_SetDefCellBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetDefCellBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDefCellBackgroundColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetDefCellBackgroundColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2167,7 +2231,7 @@ static PyObject *_wrap_wxGrid_SetDefCellBackgroundColour(PyObject *self, PyObjec
 }
 
 #define wxGrid_SetCellTextColour(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetCellTextColour(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_SetCellTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
@@ -2175,9 +2239,10 @@ static PyObject *_wrap_wxGrid_SetCellTextColour(PyObject *self, PyObject *args)
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellTextColour",&_argo0,&_argo1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxGrid_SetCellTextColour",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2204,15 +2269,16 @@ static PyObject *_wrap_wxGrid_SetCellTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_SetDefCellTextColour(_swigobj,_swigarg0)  (_swigobj->SetCellTextColour(_swigarg0))
-static PyObject *_wrap_wxGrid_SetDefCellTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetDefCellTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","colour", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDefCellTextColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetDefCellTextColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2239,7 +2305,7 @@ static PyObject *_wrap_wxGrid_SetDefCellTextColour(PyObject *self, PyObject *arg
 }
 
 #define wxGrid_SetCellTextFont(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetCellTextFont(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_SetCellTextFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetCellTextFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxFont * _arg1;
@@ -2247,9 +2313,10 @@ static PyObject *_wrap_wxGrid_SetCellTextFont(PyObject *self, PyObject *args) {
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellTextFont",&_argo0,&_argo1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxGrid_SetCellTextFont",_kwnames,&_argo0,&_argo1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2276,15 +2343,16 @@ static PyObject *_wrap_wxGrid_SetCellTextFont(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetDefCellTextFont(_swigobj,_swigarg0)  (_swigobj->SetCellTextFont(_swigarg0))
-static PyObject *_wrap_wxGrid_SetDefCellTextFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetDefCellTextFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDefCellTextFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetDefCellTextFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2311,7 +2379,7 @@ static PyObject *_wrap_wxGrid_SetDefCellTextFont(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_SetCellValue(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetCellValue(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxString * _arg1;
@@ -2319,9 +2387,10 @@ static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args) {
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","val","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOii:wxGrid_SetCellValue",&_argo0,&_obj1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOii:wxGrid_SetCellValue",_kwnames,&_argo0,&_obj1,&_arg2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2352,15 +2421,16 @@ static PyObject *_wrap_wxGrid_SetCellValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetColumnWidth(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetColumnWidth(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_SetColumnWidth(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetColumnWidth(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","col","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetColumnWidth",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_SetColumnWidth",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2380,15 +2450,16 @@ static PyObject *_wrap_wxGrid_SetColumnWidth(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetDividerPen(_swigobj,_swigarg0)  (_swigobj->SetDividerPen(_swigarg0))
-static PyObject *_wrap_wxGrid_SetDividerPen(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetDividerPen(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxPen * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","pen", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetDividerPen",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetDividerPen",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2415,15 +2486,16 @@ static PyObject *_wrap_wxGrid_SetDividerPen(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetEditable(_swigobj,_swigarg0)  (_swigobj->SetEditable(_swigarg0))
-static PyObject *_wrap_wxGrid_SetEditable(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","editable", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGrid_SetEditable",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGrid_SetEditable",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2444,15 +2516,16 @@ static PyObject *_wrap_wxGrid_SetEditable(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetGridCursor(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetGridCursor(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_SetGridCursor(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetGridCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetGridCursor",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_SetGridCursor",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2472,15 +2545,16 @@ static PyObject *_wrap_wxGrid_SetGridCursor(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetLabelAlignment(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabelAlignment(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_SetLabelAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetLabelAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation","alignment", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetLabelAlignment",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_SetLabelAlignment",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2500,15 +2574,16 @@ static PyObject *_wrap_wxGrid_SetLabelAlignment(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_SetLabelBackgroundColour(_swigobj,_swigarg0)  (_swigobj->SetLabelBackgroundColour(_swigarg0))
-static PyObject *_wrap_wxGrid_SetLabelBackgroundColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetLabelBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetLabelBackgroundColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetLabelBackgroundColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2535,15 +2610,16 @@ static PyObject *_wrap_wxGrid_SetLabelBackgroundColour(PyObject *self, PyObject
 }
 
 #define wxGrid_SetLabelSize(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetLabelSize(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_SetLabelSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetLabelSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetLabelSize",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_SetLabelSize",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2563,15 +2639,16 @@ static PyObject *_wrap_wxGrid_SetLabelSize(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetLabelTextColour(_swigobj,_swigarg0)  (_swigobj->SetLabelTextColour(_swigarg0))
-static PyObject *_wrap_wxGrid_SetLabelTextColour(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetLabelTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxColour * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","value", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetLabelTextColour",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetLabelTextColour",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2598,15 +2675,16 @@ static PyObject *_wrap_wxGrid_SetLabelTextColour(PyObject *self, PyObject *args)
 }
 
 #define wxGrid_SetLabelTextFont(_swigobj,_swigarg0)  (_swigobj->SetLabelTextFont(_swigarg0))
-static PyObject *_wrap_wxGrid_SetLabelTextFont(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetLabelTextFont(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     wxFont * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","font", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGrid_SetLabelTextFont",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGrid_SetLabelTextFont",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2633,7 +2711,7 @@ static PyObject *_wrap_wxGrid_SetLabelTextFont(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetLabelValue(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SetLabelValue(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxGrid_SetLabelValue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetLabelValue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
@@ -2641,9 +2719,10 @@ static PyObject *_wrap_wxGrid_SetLabelValue(PyObject *self, PyObject *args) {
     int  _arg3;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","orientation","value","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiOi:wxGrid_SetLabelValue",&_argo0,&_arg1,&_obj2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOi:wxGrid_SetLabelValue",_kwnames,&_argo0,&_arg1,&_obj2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2674,15 +2753,16 @@ static PyObject *_wrap_wxGrid_SetLabelValue(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetRowHeight(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetRowHeight(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxGrid_SetRowHeight(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetRowHeight(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","row","height", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxGrid_SetRowHeight",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxGrid_SetRowHeight",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2702,13 +2782,14 @@ static PyObject *_wrap_wxGrid_SetRowHeight(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_UpdateDimensions(_swigobj)  (_swigobj->UpdateDimensions())
-static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_UpdateDimensions",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_UpdateDimensions",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2728,14 +2809,15 @@ static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_GetEditInPlace(_swigobj)  (_swigobj->GetEditInPlace())
-static PyObject *_wrap_wxGrid_GetEditInPlace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_GetEditInPlace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGrid * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGrid_GetEditInPlace",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGrid_GetEditInPlace",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2754,14 +2836,15 @@ static PyObject *_wrap_wxGrid_GetEditInPlace(PyObject *self, PyObject *args) {
 }
 
 #define wxGrid_SetEditInPlace(_swigobj,_swigarg0)  (_swigobj->SetEditInPlace(_swigarg0))
-static PyObject *_wrap_wxGrid_SetEditInPlace(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGrid_SetEditInPlace(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGrid * _arg0;
     int  _arg1 = (int ) TRUE;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","edit", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxGrid_SetEditInPlace",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxGrid_SetEditInPlace",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2789,15 +2872,16 @@ static void *SwigwxGridEventTowxEvent(void *ptr) {
 }
 
 #define wxGridEvent_m_row_set(_swigobj,_swigval) (_swigobj->m_row = _swigval,_swigval)
-static PyObject *_wrap_wxGridEvent_m_row_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_row_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_row", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_row_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEvent_m_row_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2816,14 +2900,15 @@ static PyObject *_wrap_wxGridEvent_m_row_set(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_row_get(_swigobj) ((int ) _swigobj->m_row)
-static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_row_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_m_row_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2842,15 +2927,16 @@ static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval)
-static PyObject *_wrap_wxGridEvent_m_col_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_col_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_col", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_col_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEvent_m_col_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2869,14 +2955,15 @@ static PyObject *_wrap_wxGridEvent_m_col_set(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col)
-static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_col_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_m_col_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2895,15 +2982,16 @@ static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval)
-static PyObject *_wrap_wxGridEvent_m_x_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_x_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_x", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_x_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEvent_m_x_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2922,14 +3010,15 @@ static PyObject *_wrap_wxGridEvent_m_x_set(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_x_get(_swigobj) ((int ) _swigobj->m_x)
-static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_x_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_m_x_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2948,15 +3037,16 @@ static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval)
-static PyObject *_wrap_wxGridEvent_m_y_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_y_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","m_y", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_y_set",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEvent_m_y_set",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -2975,14 +3065,15 @@ static PyObject *_wrap_wxGridEvent_m_y_set(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_y_get(_swigobj) ((int ) _swigobj->m_y)
-static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_y_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_m_y_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3001,16 +3092,17 @@ static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_control_set(_swigobj,_swigval) (_swigobj->m_control = _swigval,_swigval)
-static PyObject *_wrap_wxGridEvent_m_control_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_control_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_control", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_control_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEvent_m_control_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3030,14 +3122,15 @@ static PyObject *_wrap_wxGridEvent_m_control_set(PyObject *self, PyObject *args)
 }
 
 #define wxGridEvent_m_control_get(_swigobj) ((bool ) _swigobj->m_control)
-static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_control_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_m_control_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3056,16 +3149,17 @@ static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args)
 }
 
 #define wxGridEvent_m_shift_set(_swigobj,_swigval) (_swigobj->m_shift = _swigval,_swigval)
-static PyObject *_wrap_wxGridEvent_m_shift_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_shift_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","m_shift", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxGridEvent_m_shift_set",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridEvent_m_shift_set",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3085,14 +3179,15 @@ static PyObject *_wrap_wxGridEvent_m_shift_set(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_shift_get(_swigobj) ((bool ) _swigobj->m_shift)
-static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_shift_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_m_shift_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3111,17 +3206,18 @@ static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_cell_set(_swigobj,_swigval) (_swigobj->m_cell = _swigval,_swigval)
-static PyObject *_wrap_wxGridEvent_m_cell_set(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_cell_set(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGridEvent * _arg0;
     wxGridCell * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","m_cell", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxGridEvent_m_cell_set",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxGridEvent_m_cell_set",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3153,15 +3249,16 @@ static PyObject *_wrap_wxGridEvent_m_cell_set(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_m_cell_get(_swigobj) ((wxGridCell *) _swigobj->m_cell)
-static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_m_cell_get",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_m_cell_get",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3186,14 +3283,15 @@ static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_GetRow(_swigobj)  (_swigobj->GetRow())
-static PyObject *_wrap_wxGridEvent_GetRow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_GetRow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetRow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_GetRow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3212,14 +3310,15 @@ static PyObject *_wrap_wxGridEvent_GetRow(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_GetCol(_swigobj)  (_swigobj->GetCol())
-static PyObject *_wrap_wxGridEvent_GetCol(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_GetCol(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetCol",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_GetCol",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3238,15 +3337,16 @@ static PyObject *_wrap_wxGridEvent_GetCol(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_GetPosition(_swigobj)  (_swigobj->GetPosition())
-static PyObject *_wrap_wxGridEvent_GetPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_GetPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPoint * _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_GetPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3266,14 +3366,15 @@ static PyObject *_wrap_wxGridEvent_GetPosition(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_ControlDown(_swigobj)  (_swigobj->ControlDown())
-static PyObject *_wrap_wxGridEvent_ControlDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_ControlDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_ControlDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_ControlDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3292,14 +3393,15 @@ static PyObject *_wrap_wxGridEvent_ControlDown(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_ShiftDown(_swigobj)  (_swigobj->ShiftDown())
-static PyObject *_wrap_wxGridEvent_ShiftDown(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_ShiftDown(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_ShiftDown",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_ShiftDown",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3318,15 +3420,16 @@ static PyObject *_wrap_wxGridEvent_ShiftDown(PyObject *self, PyObject *args) {
 }
 
 #define wxGridEvent_GetCell(_swigobj)  (_swigobj->GetCell())
-static PyObject *_wrap_wxGridEvent_GetCell(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxGridEvent_GetCell(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxGridCell * _result;
     wxGridEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxGridEvent_GetCell",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridEvent_GetCell",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3375,14 +3478,15 @@ static void *SwigwxNotebookEventTowxEvent(void *ptr) {
 }
 
 #define wxNotebookEvent_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxNotebookEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebookEvent_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3401,14 +3505,15 @@ static PyObject *_wrap_wxNotebookEvent_GetSelection(PyObject *self, PyObject *ar
 }
 
 #define wxNotebookEvent_GetOldSelection(_swigobj)  (_swigobj->GetOldSelection())
-static PyObject *_wrap_wxNotebookEvent_GetOldSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebookEvent_GetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxNotebookEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebookEvent_GetOldSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebookEvent_GetOldSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3427,14 +3532,15 @@ static PyObject *_wrap_wxNotebookEvent_GetOldSelection(PyObject *self, PyObject
 }
 
 #define wxNotebookEvent_SetOldSelection(_swigobj,_swigarg0)  (_swigobj->SetOldSelection(_swigarg0))
-static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxNotebookEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","page", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebookEvent_SetOldSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebookEvent_SetOldSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3454,14 +3560,15 @@ static PyObject *_wrap_wxNotebookEvent_SetOldSelection(PyObject *self, PyObject
 }
 
 #define wxNotebookEvent_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebookEvent_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxNotebookEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","page", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebookEvent_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebookEvent_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3505,7 +3612,7 @@ static void *SwigwxNotebookTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxNotebook(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxNotebook * _result;
     wxWindow * _arg0;
@@ -3517,10 +3624,11 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxNotebook",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxNotebook",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3559,14 +3667,15 @@ static PyObject *_wrap_new_wxNotebook(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_GetPageCount(_swigobj)  (_swigobj->GetPageCount())
-static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetPageCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetPageCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3585,15 +3694,16 @@ static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_SetSelection(_swigobj,_swigarg0)  (_swigobj->SetSelection(_swigarg0))
-static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","nPage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_SetSelection",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3612,15 +3722,16 @@ static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_AdvanceSelection(_swigobj,_swigarg0)  (_swigobj->AdvanceSelection(_swigarg0))
-static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxNotebook * _arg0;
     bool  _arg1 = (bool ) TRUE;
     PyObject * _argo0 = 0;
     int tempbool1 = (int) TRUE;
+    char *_kwnames[] = { "self","bForward", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|i:wxNotebook_AdvanceSelection",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3641,14 +3752,15 @@ static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *arg
 }
 
 #define wxNotebook_GetSelection(_swigobj)  (_swigobj->GetSelection())
-static PyObject *_wrap_wxNotebook_GetSelection(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_GetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetSelection",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetSelection",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3667,7 +3779,7 @@ static PyObject *_wrap_wxNotebook_GetSelection(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_SetPageText(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetPageText(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
@@ -3675,9 +3787,10 @@ static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args) {
     wxString * _arg2;
     PyObject * _argo0 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","nPage","strText", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiO:wxNotebook_SetPageText",&_argo0,&_arg1,&_obj2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxNotebook_SetPageText",_kwnames,&_argo0,&_arg1,&_obj2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3707,15 +3820,16 @@ static PyObject *_wrap_wxNotebook_SetPageText(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_GetPageText(_swigobj,_swigarg0)  (_swigobj->GetPageText(_swigarg0))
-static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxNotebook * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","nPage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_GetPageText",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageText",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3739,15 +3853,16 @@ static PyObject *_wrap_wxNotebook_GetPageText(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_SetImageList(_swigobj,_swigarg0)  (_swigobj->SetImageList(_swigarg0))
-static PyObject *_wrap_wxNotebook_SetImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_SetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxNotebook * _arg0;
     wxImageList * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","imageList", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxNotebook_SetImageList",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetImageList",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3774,15 +3889,16 @@ static PyObject *_wrap_wxNotebook_SetImageList(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_GetImageList(_swigobj)  (_swigobj->GetImageList())
-static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxImageList * _result;
     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetImageList",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetImageList",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3807,15 +3923,16 @@ static PyObject *_wrap_wxNotebook_GetImageList(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_GetPageImage(_swigobj,_swigarg0)  (_swigobj->GetPageImage(_swigarg0))
-static PyObject *_wrap_wxNotebook_GetPageImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_GetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","nPage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_GetPageImage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPageImage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3834,16 +3951,17 @@ static PyObject *_wrap_wxNotebook_GetPageImage(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_SetPageImage(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetPageImage(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
     int  _arg1;
     int  _arg2;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","nPage","nImage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxNotebook_SetPageImage",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxNotebook_SetPageImage",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3862,14 +3980,15 @@ static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_GetRowCount(_swigobj)  (_swigobj->GetRowCount())
-static PyObject *_wrap_wxNotebook_GetRowCount(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_GetRowCount(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebook_GetRowCount",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_GetRowCount",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3888,15 +4007,16 @@ static PyObject *_wrap_wxNotebook_GetRowCount(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_DeletePage(_swigobj,_swigarg0)  (_swigobj->DeletePage(_swigarg0))
-static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","nPage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_DeletePage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_DeletePage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3915,15 +4035,16 @@ static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_RemovePage(_swigobj,_swigarg0)  (_swigobj->RemovePage(_swigarg0))
-static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","nPage", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_RemovePage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_RemovePage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3942,14 +4063,15 @@ static PyObject *_wrap_wxNotebook_RemovePage(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_DeleteAllPages(_swigobj)  (_swigobj->DeleteAllPages())
-static PyObject *_wrap_wxNotebook_DeleteAllPages(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_DeleteAllPages(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebook_DeleteAllPages",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_DeleteAllPages",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -3968,7 +4090,7 @@ static PyObject *_wrap_wxNotebook_DeleteAllPages(PyObject *self, PyObject *args)
 }
 
 #define wxNotebook_AddPage(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3)  (_swigobj->AddPage(_swigarg0,_swigarg1,_swigarg2,_swigarg3))
-static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
@@ -3979,9 +4101,10 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _obj2 = 0;
+    char *_kwnames[] = { "self","pPage","strText","bSelect","imageId", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|ii:wxNotebook_AddPage",&_argo0,&_argo1,&_obj2,&_arg3,&_arg4)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3,&_arg4)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4018,7 +4141,7 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_InsertPage(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)  (_swigobj->InsertPage(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
-static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxNotebook * _arg0;
@@ -4031,9 +4154,10 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args) {
     PyObject * _argo2 = 0;
     PyObject * _obj3 = 0;
     int tempbool4 = (int) FALSE;
+    char *_kwnames[] = { "self","nPage","pPage","strText","bSelect","imageId", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OiOO|ii:wxNotebook_InsertPage",&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|ii:wxNotebook_InsertPage",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&tempbool4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4071,16 +4195,17 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args) {
 }
 
 #define wxNotebook_GetPage(_swigobj,_swigarg0)  (_swigobj->GetPage(_swigarg0))
-static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxNotebook * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","nPage", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxNotebook_GetPage",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4108,13 +4233,14 @@ static void  wxNotebook_ResizeChildren(wxNotebook *self) {
             wxSizeEvent evt(self->GetClientSize());
             self->GetEventHandler()->ProcessEvent(evt);
         }
-static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxNotebook * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxNotebook_ResizeChildren",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_ResizeChildren",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4150,14 +4276,15 @@ static void *SwigwxSplitterEventTowxEvent(void *ptr) {
 }
 
 #define wxSplitterEvent_GetSashPosition(_swigobj)  (_swigobj->GetSashPosition())
-static PyObject *_wrap_wxSplitterEvent_GetSashPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterEvent_GetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetSashPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterEvent_GetSashPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4176,14 +4303,15 @@ static PyObject *_wrap_wxSplitterEvent_GetSashPosition(PyObject *self, PyObject
 }
 
 #define wxSplitterEvent_GetX(_swigobj)  (_swigobj->GetX())
-static PyObject *_wrap_wxSplitterEvent_GetX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterEvent_GetX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterEvent_GetX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4202,14 +4330,15 @@ static PyObject *_wrap_wxSplitterEvent_GetX(PyObject *self, PyObject *args) {
 }
 
 #define wxSplitterEvent_GetY(_swigobj)  (_swigobj->GetY())
-static PyObject *_wrap_wxSplitterEvent_GetY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterEvent_GetY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterEvent_GetY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4228,15 +4357,16 @@ static PyObject *_wrap_wxSplitterEvent_GetY(PyObject *self, PyObject *args) {
 }
 
 #define wxSplitterEvent_GetWindowBeingRemoved(_swigobj)  (_swigobj->GetWindowBeingRemoved())
-static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterEvent_GetWindowBeingRemoved",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterEvent_GetWindowBeingRemoved",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4261,14 +4391,15 @@ static PyObject *_wrap_wxSplitterEvent_GetWindowBeingRemoved(PyObject *self, PyO
 }
 
 #define wxSplitterEvent_SetSashPosition(_swigobj,_swigarg0)  (_swigobj->SetSashPosition(_swigarg0))
-static PyObject *_wrap_wxSplitterEvent_SetSashPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterEvent_SetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","pos", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSplitterEvent_SetSashPosition",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSplitterEvent_SetSashPosition",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4304,7 +4435,7 @@ static void *SwigwxSplitterWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSplitterWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterWindow * _result;
     wxWindow * _arg0;
@@ -4316,10 +4447,11 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","point","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxSplitterWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSplitterWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4358,14 +4490,15 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxSplitterWindow_GetBorderSize(_swigobj)  (_swigobj->GetBorderSize())
-static PyObject *_wrap_wxSplitterWindow_GetBorderSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_GetBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetBorderSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetBorderSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4384,14 +4517,15 @@ static PyObject *_wrap_wxSplitterWindow_GetBorderSize(PyObject *self, PyObject *
 }
 
 #define wxSplitterWindow_GetMinimumPaneSize(_swigobj)  (_swigobj->GetMinimumPaneSize())
-static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetMinimumPaneSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetMinimumPaneSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4410,14 +4544,15 @@ static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObj
 }
 
 #define wxSplitterWindow_GetSashPosition(_swigobj)  (_swigobj->GetSashPosition())
-static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetSashPosition",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetSashPosition",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4436,14 +4571,15 @@ static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject
 }
 
 #define wxSplitterWindow_GetSashSize(_swigobj)  (_swigobj->GetSashSize())
-static PyObject *_wrap_wxSplitterWindow_GetSashSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_GetSashSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetSashSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetSashSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4462,14 +4598,15 @@ static PyObject *_wrap_wxSplitterWindow_GetSashSize(PyObject *self, PyObject *ar
 }
 
 #define wxSplitterWindow_GetSplitMode(_swigobj)  (_swigobj->GetSplitMode())
-static PyObject *_wrap_wxSplitterWindow_GetSplitMode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_GetSplitMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetSplitMode",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetSplitMode",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4488,15 +4625,16 @@ static PyObject *_wrap_wxSplitterWindow_GetSplitMode(PyObject *self, PyObject *a
 }
 
 #define wxSplitterWindow_GetWindow1(_swigobj)  (_swigobj->GetWindow1())
-static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetWindow1",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetWindow1",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4521,15 +4659,16 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow1(PyObject *self, PyObject *arg
 }
 
 #define wxSplitterWindow_GetWindow2(_swigobj)  (_swigobj->GetWindow2())
-static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_GetWindow2",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_GetWindow2",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4554,15 +4693,16 @@ static PyObject *_wrap_wxSplitterWindow_GetWindow2(PyObject *self, PyObject *arg
 }
 
 #define wxSplitterWindow_Initialize(_swigobj,_swigarg0)  (_swigobj->Initialize(_swigarg0))
-static PyObject *_wrap_wxSplitterWindow_Initialize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_Initialize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     wxWindow * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","window", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxSplitterWindow_Initialize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSplitterWindow_Initialize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4589,14 +4729,15 @@ static PyObject *_wrap_wxSplitterWindow_Initialize(PyObject *self, PyObject *arg
 }
 
 #define wxSplitterWindow_IsSplit(_swigobj)  (_swigobj->IsSplit())
-static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSplitterWindow_IsSplit",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSplitterWindow_IsSplit",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4615,14 +4756,15 @@ static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args)
 }
 
 #define wxSplitterWindow_SetBorderSize(_swigobj,_swigarg0)  (_swigobj->SetBorderSize(_swigarg0))
-static PyObject *_wrap_wxSplitterWindow_SetBorderSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_SetBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetBorderSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSplitterWindow_SetBorderSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4642,15 +4784,16 @@ static PyObject *_wrap_wxSplitterWindow_SetBorderSize(PyObject *self, PyObject *
 }
 
 #define wxSplitterWindow_SetSashPosition(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSashPosition(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     int  _arg2 = (int ) TRUE;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","position","redraw", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|i:wxSplitterWindow_SetSashPosition",&_argo0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|i:wxSplitterWindow_SetSashPosition",_kwnames,&_argo0,&_arg1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4670,14 +4813,15 @@ static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject
 }
 
 #define wxSplitterWindow_SetSashSize(_swigobj,_swigarg0)  (_swigobj->SetSashSize(_swigarg0))
-static PyObject *_wrap_wxSplitterWindow_SetSashSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_SetSashSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetSashSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSplitterWindow_SetSashSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4697,14 +4841,15 @@ static PyObject *_wrap_wxSplitterWindow_SetSashSize(PyObject *self, PyObject *ar
 }
 
 #define wxSplitterWindow_SetMinimumPaneSize(_swigobj,_swigarg0)  (_swigobj->SetMinimumPaneSize(_swigarg0))
-static PyObject *_wrap_wxSplitterWindow_SetMinimumPaneSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_SetMinimumPaneSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","paneSize", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetMinimumPaneSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSplitterWindow_SetMinimumPaneSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4724,14 +4869,15 @@ static PyObject *_wrap_wxSplitterWindow_SetMinimumPaneSize(PyObject *self, PyObj
 }
 
 #define wxSplitterWindow_SetSplitMode(_swigobj,_swigarg0)  (_swigobj->SetSplitMode(_swigarg0))
-static PyObject *_wrap_wxSplitterWindow_SetSplitMode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_SetSplitMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSplitterWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSplitterWindow_SetSplitMode",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSplitterWindow_SetSplitMode",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4751,7 +4897,7 @@ static PyObject *_wrap_wxSplitterWindow_SetSplitMode(PyObject *self, PyObject *a
 }
 
 #define wxSplitterWindow_SplitHorizontally(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SplitHorizontally(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxSplitterWindow_SplitHorizontally(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_SplitHorizontally(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;
@@ -4761,9 +4907,10 @@ static PyObject *_wrap_wxSplitterWindow_SplitHorizontally(PyObject *self, PyObje
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","window1","window2","sashPosition", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|i:wxSplitterWindow_SplitHorizontally",&_argo0,&_argo1,&_argo2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|i:wxSplitterWindow_SplitHorizontally",_kwnames,&_argo0,&_argo1,&_argo2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4796,7 +4943,7 @@ static PyObject *_wrap_wxSplitterWindow_SplitHorizontally(PyObject *self, PyObje
 }
 
 #define wxSplitterWindow_SplitVertically(_swigobj,_swigarg0,_swigarg1,_swigarg2)  (_swigobj->SplitVertically(_swigarg0,_swigarg1,_swigarg2))
-static PyObject *_wrap_wxSplitterWindow_SplitVertically(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_SplitVertically(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;
@@ -4806,9 +4953,10 @@ static PyObject *_wrap_wxSplitterWindow_SplitVertically(PyObject *self, PyObject
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","window1","window2","sashPosition", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OOO|i:wxSplitterWindow_SplitVertically",&_argo0,&_argo1,&_argo2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|i:wxSplitterWindow_SplitVertically",_kwnames,&_argo0,&_argo1,&_argo2,&_arg3)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4841,16 +4989,17 @@ static PyObject *_wrap_wxSplitterWindow_SplitVertically(PyObject *self, PyObject
 }
 
 #define wxSplitterWindow_Unsplit(_swigobj,_swigarg0)  (_swigobj->Unsplit(_swigarg0))
-static PyObject *_wrap_wxSplitterWindow_Unsplit(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSplitterWindow_Unsplit(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxSplitterWindow * _arg0;
     wxWindow * _arg1 = (wxWindow *) NULL;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","toRemove", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|O:wxSplitterWindow_Unsplit",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxSplitterWindow_Unsplit",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4884,13 +5033,14 @@ static void *SwigwxTaskBarIconTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxTaskBarIcon() (new wxTaskBarIcon())
-static PyObject *_wrap_new_wxTaskBarIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxTaskBarIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTaskBarIcon * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxTaskBarIcon")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxTaskBarIcon",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -4908,13 +5058,14 @@ static PyObject *_wrap_new_wxTaskBarIcon(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxTaskBarIcon(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxTaskBarIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxTaskBarIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxTaskBarIcon * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxTaskBarIcon",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxTaskBarIcon",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4934,7 +5085,7 @@ static PyObject *_wrap_delete_wxTaskBarIcon(PyObject *self, PyObject *args) {
 }
 
 #define wxTaskBarIcon_SetIcon(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetIcon(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxTaskBarIcon_SetIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTaskBarIcon_SetIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTaskBarIcon * _arg0;
@@ -4942,9 +5093,10 @@ static PyObject *_wrap_wxTaskBarIcon_SetIcon(PyObject *self, PyObject *args) {
     char * _arg2 = (char *) "";
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","icon","tooltip", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|s:wxTaskBarIcon_SetIcon",&_argo0,&_argo1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|s:wxTaskBarIcon_SetIcon",_kwnames,&_argo0,&_argo1,&_arg2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4970,14 +5122,15 @@ static PyObject *_wrap_wxTaskBarIcon_SetIcon(PyObject *self, PyObject *args) {
 }
 
 #define wxTaskBarIcon_RemoveIcon(_swigobj)  (_swigobj->RemoveIcon())
-static PyObject *_wrap_wxTaskBarIcon_RemoveIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTaskBarIcon_RemoveIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTaskBarIcon * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxTaskBarIcon_RemoveIcon",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxTaskBarIcon_RemoveIcon",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4996,16 +5149,17 @@ static PyObject *_wrap_wxTaskBarIcon_RemoveIcon(PyObject *self, PyObject *args)
 }
 
 #define wxTaskBarIcon_PopupMenu(_swigobj,_swigarg0)  (_swigobj->PopupMenu(_swigarg0))
-static PyObject *_wrap_wxTaskBarIcon_PopupMenu(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxTaskBarIcon_PopupMenu(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxTaskBarIcon * _arg0;
     wxMenu * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","menu", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxTaskBarIcon_PopupMenu",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxTaskBarIcon_PopupMenu",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5031,160 +5185,160 @@ static PyObject *_wrap_wxTaskBarIcon_PopupMenu(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef windows2cMethods[] = {
-	 { "wxTaskBarIcon_PopupMenu", _wrap_wxTaskBarIcon_PopupMenu, METH_VARARGS },
-	 { "wxTaskBarIcon_RemoveIcon", _wrap_wxTaskBarIcon_RemoveIcon, METH_VARARGS },
-	 { "wxTaskBarIcon_SetIcon", _wrap_wxTaskBarIcon_SetIcon, METH_VARARGS },
-	 { "delete_wxTaskBarIcon", _wrap_delete_wxTaskBarIcon, METH_VARARGS },
-	 { "new_wxTaskBarIcon", _wrap_new_wxTaskBarIcon, METH_VARARGS },
-	 { "wxSplitterWindow_Unsplit", _wrap_wxSplitterWindow_Unsplit, METH_VARARGS },
-	 { "wxSplitterWindow_SplitVertically", _wrap_wxSplitterWindow_SplitVertically, METH_VARARGS },
-	 { "wxSplitterWindow_SplitHorizontally", _wrap_wxSplitterWindow_SplitHorizontally, METH_VARARGS },
-	 { "wxSplitterWindow_SetSplitMode", _wrap_wxSplitterWindow_SetSplitMode, METH_VARARGS },
-	 { "wxSplitterWindow_SetMinimumPaneSize", _wrap_wxSplitterWindow_SetMinimumPaneSize, METH_VARARGS },
-	 { "wxSplitterWindow_SetSashSize", _wrap_wxSplitterWindow_SetSashSize, METH_VARARGS },
-	 { "wxSplitterWindow_SetSashPosition", _wrap_wxSplitterWindow_SetSashPosition, METH_VARARGS },
-	 { "wxSplitterWindow_SetBorderSize", _wrap_wxSplitterWindow_SetBorderSize, METH_VARARGS },
-	 { "wxSplitterWindow_IsSplit", _wrap_wxSplitterWindow_IsSplit, METH_VARARGS },
-	 { "wxSplitterWindow_Initialize", _wrap_wxSplitterWindow_Initialize, METH_VARARGS },
-	 { "wxSplitterWindow_GetWindow2", _wrap_wxSplitterWindow_GetWindow2, METH_VARARGS },
-	 { "wxSplitterWindow_GetWindow1", _wrap_wxSplitterWindow_GetWindow1, METH_VARARGS },
-	 { "wxSplitterWindow_GetSplitMode", _wrap_wxSplitterWindow_GetSplitMode, METH_VARARGS },
-	 { "wxSplitterWindow_GetSashSize", _wrap_wxSplitterWindow_GetSashSize, METH_VARARGS },
-	 { "wxSplitterWindow_GetSashPosition", _wrap_wxSplitterWindow_GetSashPosition, METH_VARARGS },
-	 { "wxSplitterWindow_GetMinimumPaneSize", _wrap_wxSplitterWindow_GetMinimumPaneSize, METH_VARARGS },
-	 { "wxSplitterWindow_GetBorderSize", _wrap_wxSplitterWindow_GetBorderSize, METH_VARARGS },
-	 { "new_wxSplitterWindow", _wrap_new_wxSplitterWindow, METH_VARARGS },
-	 { "wxSplitterEvent_SetSashPosition", _wrap_wxSplitterEvent_SetSashPosition, METH_VARARGS },
-	 { "wxSplitterEvent_GetWindowBeingRemoved", _wrap_wxSplitterEvent_GetWindowBeingRemoved, METH_VARARGS },
-	 { "wxSplitterEvent_GetY", _wrap_wxSplitterEvent_GetY, METH_VARARGS },
-	 { "wxSplitterEvent_GetX", _wrap_wxSplitterEvent_GetX, METH_VARARGS },
-	 { "wxSplitterEvent_GetSashPosition", _wrap_wxSplitterEvent_GetSashPosition, METH_VARARGS },
-	 { "wxNotebook_ResizeChildren", _wrap_wxNotebook_ResizeChildren, METH_VARARGS },
-	 { "wxNotebook_GetPage", _wrap_wxNotebook_GetPage, METH_VARARGS },
-	 { "wxNotebook_InsertPage", _wrap_wxNotebook_InsertPage, METH_VARARGS },
-	 { "wxNotebook_AddPage", _wrap_wxNotebook_AddPage, METH_VARARGS },
-	 { "wxNotebook_DeleteAllPages", _wrap_wxNotebook_DeleteAllPages, METH_VARARGS },
-	 { "wxNotebook_RemovePage", _wrap_wxNotebook_RemovePage, METH_VARARGS },
-	 { "wxNotebook_DeletePage", _wrap_wxNotebook_DeletePage, METH_VARARGS },
-	 { "wxNotebook_GetRowCount", _wrap_wxNotebook_GetRowCount, METH_VARARGS },
-	 { "wxNotebook_SetPageImage", _wrap_wxNotebook_SetPageImage, METH_VARARGS },
-	 { "wxNotebook_GetPageImage", _wrap_wxNotebook_GetPageImage, METH_VARARGS },
-	 { "wxNotebook_GetImageList", _wrap_wxNotebook_GetImageList, METH_VARARGS },
-	 { "wxNotebook_SetImageList", _wrap_wxNotebook_SetImageList, METH_VARARGS },
-	 { "wxNotebook_GetPageText", _wrap_wxNotebook_GetPageText, METH_VARARGS },
-	 { "wxNotebook_SetPageText", _wrap_wxNotebook_SetPageText, METH_VARARGS },
-	 { "wxNotebook_GetSelection", _wrap_wxNotebook_GetSelection, METH_VARARGS },
-	 { "wxNotebook_AdvanceSelection", _wrap_wxNotebook_AdvanceSelection, METH_VARARGS },
-	 { "wxNotebook_SetSelection", _wrap_wxNotebook_SetSelection, METH_VARARGS },
-	 { "wxNotebook_GetPageCount", _wrap_wxNotebook_GetPageCount, METH_VARARGS },
-	 { "new_wxNotebook", _wrap_new_wxNotebook, METH_VARARGS },
-	 { "wxNotebookEvent_SetSelection", _wrap_wxNotebookEvent_SetSelection, METH_VARARGS },
-	 { "wxNotebookEvent_SetOldSelection", _wrap_wxNotebookEvent_SetOldSelection, METH_VARARGS },
-	 { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, METH_VARARGS },
-	 { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, METH_VARARGS },
-	 { "wxGridEvent_GetCell", _wrap_wxGridEvent_GetCell, METH_VARARGS },
-	 { "wxGridEvent_ShiftDown", _wrap_wxGridEvent_ShiftDown, METH_VARARGS },
-	 { "wxGridEvent_ControlDown", _wrap_wxGridEvent_ControlDown, METH_VARARGS },
-	 { "wxGridEvent_GetPosition", _wrap_wxGridEvent_GetPosition, METH_VARARGS },
-	 { "wxGridEvent_GetCol", _wrap_wxGridEvent_GetCol, METH_VARARGS },
-	 { "wxGridEvent_GetRow", _wrap_wxGridEvent_GetRow, METH_VARARGS },
-	 { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, METH_VARARGS },
-	 { "wxGridEvent_m_cell_set", _wrap_wxGridEvent_m_cell_set, METH_VARARGS },
-	 { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, METH_VARARGS },
-	 { "wxGridEvent_m_shift_set", _wrap_wxGridEvent_m_shift_set, METH_VARARGS },
-	 { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, METH_VARARGS },
-	 { "wxGridEvent_m_control_set", _wrap_wxGridEvent_m_control_set, METH_VARARGS },
-	 { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, METH_VARARGS },
-	 { "wxGridEvent_m_y_set", _wrap_wxGridEvent_m_y_set, METH_VARARGS },
-	 { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, METH_VARARGS },
-	 { "wxGridEvent_m_x_set", _wrap_wxGridEvent_m_x_set, METH_VARARGS },
-	 { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, METH_VARARGS },
-	 { "wxGridEvent_m_col_set", _wrap_wxGridEvent_m_col_set, METH_VARARGS },
-	 { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, METH_VARARGS },
-	 { "wxGridEvent_m_row_set", _wrap_wxGridEvent_m_row_set, METH_VARARGS },
-	 { "wxGrid_SetEditInPlace", _wrap_wxGrid_SetEditInPlace, METH_VARARGS },
-	 { "wxGrid_GetEditInPlace", _wrap_wxGrid_GetEditInPlace, METH_VARARGS },
-	 { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, METH_VARARGS },
-	 { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, METH_VARARGS },
-	 { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, METH_VARARGS },
-	 { "wxGrid_SetLabelTextFont", _wrap_wxGrid_SetLabelTextFont, METH_VARARGS },
-	 { "wxGrid_SetLabelTextColour", _wrap_wxGrid_SetLabelTextColour, METH_VARARGS },
-	 { "wxGrid_SetLabelSize", _wrap_wxGrid_SetLabelSize, METH_VARARGS },
-	 { "wxGrid_SetLabelBackgroundColour", _wrap_wxGrid_SetLabelBackgroundColour, METH_VARARGS },
-	 { "wxGrid_SetLabelAlignment", _wrap_wxGrid_SetLabelAlignment, METH_VARARGS },
-	 { "wxGrid_SetGridCursor", _wrap_wxGrid_SetGridCursor, METH_VARARGS },
-	 { "wxGrid_SetEditable", _wrap_wxGrid_SetEditable, METH_VARARGS },
-	 { "wxGrid_SetDividerPen", _wrap_wxGrid_SetDividerPen, METH_VARARGS },
-	 { "wxGrid_SetColumnWidth", _wrap_wxGrid_SetColumnWidth, METH_VARARGS },
-	 { "wxGrid_SetCellValue", _wrap_wxGrid_SetCellValue, METH_VARARGS },
-	 { "wxGrid_SetDefCellTextFont", _wrap_wxGrid_SetDefCellTextFont, METH_VARARGS },
-	 { "wxGrid_SetCellTextFont", _wrap_wxGrid_SetCellTextFont, METH_VARARGS },
-	 { "wxGrid_SetDefCellTextColour", _wrap_wxGrid_SetDefCellTextColour, METH_VARARGS },
-	 { "wxGrid_SetCellTextColour", _wrap_wxGrid_SetCellTextColour, METH_VARARGS },
-	 { "wxGrid_SetDefCellBackgroundColour", _wrap_wxGrid_SetDefCellBackgroundColour, METH_VARARGS },
-	 { "wxGrid_SetCellBackgroundColour", _wrap_wxGrid_SetCellBackgroundColour, METH_VARARGS },
-	 { "wxGrid_SetDefCellAlignment", _wrap_wxGrid_SetDefCellAlignment, METH_VARARGS },
-	 { "wxGrid_SetCellAlignment", _wrap_wxGrid_SetCellAlignment, METH_VARARGS },
-	 { "wxGrid_OnActivate", _wrap_wxGrid_OnActivate, METH_VARARGS },
-	 { "wxGrid_InsertRows", _wrap_wxGrid_InsertRows, METH_VARARGS },
-	 { "wxGrid_InsertCols", _wrap_wxGrid_InsertCols, METH_VARARGS },
-	 { "wxGrid_GetVertScrollBar", _wrap_wxGrid_GetVertScrollBar, METH_VARARGS },
-	 { "wxGrid_GetTextItem", _wrap_wxGrid_GetTextItem, METH_VARARGS },
-	 { "wxGrid_GetScrollPosY", _wrap_wxGrid_GetScrollPosY, METH_VARARGS },
-	 { "wxGrid_GetScrollPosX", _wrap_wxGrid_GetScrollPosX, METH_VARARGS },
-	 { "wxGrid_GetRows", _wrap_wxGrid_GetRows, METH_VARARGS },
-	 { "wxGrid_GetRowHeight", _wrap_wxGrid_GetRowHeight, METH_VARARGS },
-	 { "wxGrid_GetLabelValue", _wrap_wxGrid_GetLabelValue, METH_VARARGS },
-	 { "wxGrid_GetLabelTextFont", _wrap_wxGrid_GetLabelTextFont, METH_VARARGS },
-	 { "wxGrid_GetLabelTextColour", _wrap_wxGrid_GetLabelTextColour, METH_VARARGS },
-	 { "wxGrid_GetLabelSize", _wrap_wxGrid_GetLabelSize, METH_VARARGS },
-	 { "wxGrid_GetLabelBackgroundColour", _wrap_wxGrid_GetLabelBackgroundColour, METH_VARARGS },
-	 { "wxGrid_GetLabelAlignment", _wrap_wxGrid_GetLabelAlignment, METH_VARARGS },
-	 { "wxGrid_GetHorizScrollBar", _wrap_wxGrid_GetHorizScrollBar, METH_VARARGS },
-	 { "wxGrid_GetEditable", _wrap_wxGrid_GetEditable, METH_VARARGS },
-	 { "wxGrid_GetCursorRow", _wrap_wxGrid_GetCursorRow, METH_VARARGS },
-	 { "wxGrid_GetCursorColumn", _wrap_wxGrid_GetCursorColumn, METH_VARARGS },
-	 { "wxGrid_GetCurrentRect", _wrap_wxGrid_GetCurrentRect, METH_VARARGS },
-	 { "wxGrid_GetColumnWidth", _wrap_wxGrid_GetColumnWidth, METH_VARARGS },
-	 { "wxGrid_GetCols", _wrap_wxGrid_GetCols, METH_VARARGS },
-	 { "wxGrid_GetCellValue", _wrap_wxGrid_GetCellValue, METH_VARARGS },
-	 { "wxGrid_GetDefCellTextFont", _wrap_wxGrid_GetDefCellTextFont, METH_VARARGS },
-	 { "wxGrid_GetCellTextFont", _wrap_wxGrid_GetCellTextFont, METH_VARARGS },
-	 { "wxGrid_GetDefCellTextColour", _wrap_wxGrid_GetDefCellTextColour, METH_VARARGS },
-	 { "wxGrid_GetCellTextColour", _wrap_wxGrid_GetCellTextColour, METH_VARARGS },
-	 { "wxGrid_GetCells", _wrap_wxGrid_GetCells, METH_VARARGS },
-	 { "wxGrid_GetDefCellBackgroundColour", _wrap_wxGrid_GetDefCellBackgroundColour, METH_VARARGS },
-	 { "wxGrid_GetCellBackgroundColour", _wrap_wxGrid_GetCellBackgroundColour, METH_VARARGS },
-	 { "wxGrid_GetDefCellAlignment", _wrap_wxGrid_GetDefCellAlignment, METH_VARARGS },
-	 { "wxGrid_GetCellAlignment", _wrap_wxGrid_GetCellAlignment, METH_VARARGS },
-	 { "wxGrid_GetCell", _wrap_wxGrid_GetCell, METH_VARARGS },
-	 { "wxGrid_GetBatchCount", _wrap_wxGrid_GetBatchCount, METH_VARARGS },
-	 { "wxGrid_EndBatch", _wrap_wxGrid_EndBatch, METH_VARARGS },
-	 { "wxGrid_DeleteRows", _wrap_wxGrid_DeleteRows, METH_VARARGS },
-	 { "wxGrid_DeleteCols", _wrap_wxGrid_DeleteCols, METH_VARARGS },
-	 { "wxGrid_CurrentCellVisible", _wrap_wxGrid_CurrentCellVisible, METH_VARARGS },
-	 { "wxGrid_CreateGrid", _wrap_wxGrid_CreateGrid, METH_VARARGS },
-	 { "wxGrid_CellHitTest", _wrap_wxGrid_CellHitTest, METH_VARARGS },
-	 { "wxGrid_BeginBatch", _wrap_wxGrid_BeginBatch, METH_VARARGS },
-	 { "wxGrid_AppendRows", _wrap_wxGrid_AppendRows, METH_VARARGS },
-	 { "wxGrid_AppendCols", _wrap_wxGrid_AppendCols, METH_VARARGS },
-	 { "wxGrid_AdjustScrollbars", _wrap_wxGrid_AdjustScrollbars, METH_VARARGS },
-	 { "new_wxGrid", _wrap_new_wxGrid, METH_VARARGS },
-	 { "wxGridCell_SetCellBitmap", _wrap_wxGridCell_SetCellBitmap, METH_VARARGS },
-	 { "wxGridCell_GetCellBitmap", _wrap_wxGridCell_GetCellBitmap, METH_VARARGS },
-	 { "wxGridCell_SetAlignment", _wrap_wxGridCell_SetAlignment, METH_VARARGS },
-	 { "wxGridCell_GetAlignment", _wrap_wxGridCell_GetAlignment, METH_VARARGS },
-	 { "wxGridCell_GetBackgroundBrush", _wrap_wxGridCell_GetBackgroundBrush, METH_VARARGS },
-	 { "wxGridCell_SetBackgroundColour", _wrap_wxGridCell_SetBackgroundColour, METH_VARARGS },
-	 { "wxGridCell_GetBackgroundColour", _wrap_wxGridCell_GetBackgroundColour, METH_VARARGS },
-	 { "wxGridCell_SetTextColour", _wrap_wxGridCell_SetTextColour, METH_VARARGS },
-	 { "wxGridCell_GetTextColour", _wrap_wxGridCell_GetTextColour, METH_VARARGS },
-	 { "wxGridCell_SetFont", _wrap_wxGridCell_SetFont, METH_VARARGS },
-	 { "wxGridCell_GetFont", _wrap_wxGridCell_GetFont, METH_VARARGS },
-	 { "wxGridCell_SetTextValue", _wrap_wxGridCell_SetTextValue, METH_VARARGS },
-	 { "wxGridCell_GetTextValue", _wrap_wxGridCell_GetTextValue, METH_VARARGS },
-	 { "delete_wxGridCell", _wrap_delete_wxGridCell, METH_VARARGS },
-	 { "new_wxGridCell", _wrap_new_wxGridCell, METH_VARARGS },
+	 { "wxTaskBarIcon_PopupMenu", (PyCFunction) _wrap_wxTaskBarIcon_PopupMenu, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTaskBarIcon_RemoveIcon", (PyCFunction) _wrap_wxTaskBarIcon_RemoveIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "wxTaskBarIcon_SetIcon", (PyCFunction) _wrap_wxTaskBarIcon_SetIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxTaskBarIcon", (PyCFunction) _wrap_delete_wxTaskBarIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxTaskBarIcon", (PyCFunction) _wrap_new_wxTaskBarIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_Unsplit", (PyCFunction) _wrap_wxSplitterWindow_Unsplit, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_SplitVertically", (PyCFunction) _wrap_wxSplitterWindow_SplitVertically, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_SplitHorizontally", (PyCFunction) _wrap_wxSplitterWindow_SplitHorizontally, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_SetSplitMode", (PyCFunction) _wrap_wxSplitterWindow_SetSplitMode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_SetMinimumPaneSize", (PyCFunction) _wrap_wxSplitterWindow_SetMinimumPaneSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_SetSashSize", (PyCFunction) _wrap_wxSplitterWindow_SetSashSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_SetSashPosition", (PyCFunction) _wrap_wxSplitterWindow_SetSashPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_SetBorderSize", (PyCFunction) _wrap_wxSplitterWindow_SetBorderSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_IsSplit", (PyCFunction) _wrap_wxSplitterWindow_IsSplit, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_Initialize", (PyCFunction) _wrap_wxSplitterWindow_Initialize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_GetWindow2", (PyCFunction) _wrap_wxSplitterWindow_GetWindow2, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_GetWindow1", (PyCFunction) _wrap_wxSplitterWindow_GetWindow1, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_GetSplitMode", (PyCFunction) _wrap_wxSplitterWindow_GetSplitMode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_GetSashSize", (PyCFunction) _wrap_wxSplitterWindow_GetSashSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_GetSashPosition", (PyCFunction) _wrap_wxSplitterWindow_GetSashPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_GetMinimumPaneSize", (PyCFunction) _wrap_wxSplitterWindow_GetMinimumPaneSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterWindow_GetBorderSize", (PyCFunction) _wrap_wxSplitterWindow_GetBorderSize, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSplitterWindow", (PyCFunction) _wrap_new_wxSplitterWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterEvent_SetSashPosition", (PyCFunction) _wrap_wxSplitterEvent_SetSashPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterEvent_GetWindowBeingRemoved", (PyCFunction) _wrap_wxSplitterEvent_GetWindowBeingRemoved, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterEvent_GetY", (PyCFunction) _wrap_wxSplitterEvent_GetY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterEvent_GetX", (PyCFunction) _wrap_wxSplitterEvent_GetX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSplitterEvent_GetSashPosition", (PyCFunction) _wrap_wxSplitterEvent_GetSashPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_ResizeChildren", (PyCFunction) _wrap_wxNotebook_ResizeChildren, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_GetPage", (PyCFunction) _wrap_wxNotebook_GetPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_InsertPage", (PyCFunction) _wrap_wxNotebook_InsertPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_AddPage", (PyCFunction) _wrap_wxNotebook_AddPage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_DeleteAllPages", (PyCFunction) _wrap_wxNotebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_RemovePage", (PyCFunction) _wrap_wxNotebook_RemovePage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_DeletePage", (PyCFunction) _wrap_wxNotebook_DeletePage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_GetRowCount", (PyCFunction) _wrap_wxNotebook_GetRowCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_SetPageImage", (PyCFunction) _wrap_wxNotebook_SetPageImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_GetPageImage", (PyCFunction) _wrap_wxNotebook_GetPageImage, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_GetImageList", (PyCFunction) _wrap_wxNotebook_GetImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_SetImageList", (PyCFunction) _wrap_wxNotebook_SetImageList, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_GetPageText", (PyCFunction) _wrap_wxNotebook_GetPageText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_SetPageText", (PyCFunction) _wrap_wxNotebook_SetPageText, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_GetSelection", (PyCFunction) _wrap_wxNotebook_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_AdvanceSelection", (PyCFunction) _wrap_wxNotebook_AdvanceSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_SetSelection", (PyCFunction) _wrap_wxNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebook_GetPageCount", (PyCFunction) _wrap_wxNotebook_GetPageCount, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxNotebook", (PyCFunction) _wrap_new_wxNotebook, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebookEvent_SetSelection", (PyCFunction) _wrap_wxNotebookEvent_SetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebookEvent_SetOldSelection", (PyCFunction) _wrap_wxNotebookEvent_SetOldSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebookEvent_GetOldSelection", (PyCFunction) _wrap_wxNotebookEvent_GetOldSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxNotebookEvent_GetSelection", (PyCFunction) _wrap_wxNotebookEvent_GetSelection, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_GetCell", (PyCFunction) _wrap_wxGridEvent_GetCell, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_ShiftDown", (PyCFunction) _wrap_wxGridEvent_ShiftDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_ControlDown", (PyCFunction) _wrap_wxGridEvent_ControlDown, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_GetPosition", (PyCFunction) _wrap_wxGridEvent_GetPosition, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_GetCol", (PyCFunction) _wrap_wxGridEvent_GetCol, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_GetRow", (PyCFunction) _wrap_wxGridEvent_GetRow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_cell_get", (PyCFunction) _wrap_wxGridEvent_m_cell_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_cell_set", (PyCFunction) _wrap_wxGridEvent_m_cell_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_shift_get", (PyCFunction) _wrap_wxGridEvent_m_shift_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_shift_set", (PyCFunction) _wrap_wxGridEvent_m_shift_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_control_get", (PyCFunction) _wrap_wxGridEvent_m_control_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_control_set", (PyCFunction) _wrap_wxGridEvent_m_control_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_y_get", (PyCFunction) _wrap_wxGridEvent_m_y_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_y_set", (PyCFunction) _wrap_wxGridEvent_m_y_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_x_get", (PyCFunction) _wrap_wxGridEvent_m_x_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_x_set", (PyCFunction) _wrap_wxGridEvent_m_x_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_col_get", (PyCFunction) _wrap_wxGridEvent_m_col_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_col_set", (PyCFunction) _wrap_wxGridEvent_m_col_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_row_get", (PyCFunction) _wrap_wxGridEvent_m_row_get, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridEvent_m_row_set", (PyCFunction) _wrap_wxGridEvent_m_row_set, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetEditInPlace", (PyCFunction) _wrap_wxGrid_SetEditInPlace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetEditInPlace", (PyCFunction) _wrap_wxGrid_GetEditInPlace, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_UpdateDimensions", (PyCFunction) _wrap_wxGrid_UpdateDimensions, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetRowHeight", (PyCFunction) _wrap_wxGrid_SetRowHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetLabelValue", (PyCFunction) _wrap_wxGrid_SetLabelValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetLabelTextFont", (PyCFunction) _wrap_wxGrid_SetLabelTextFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetLabelTextColour", (PyCFunction) _wrap_wxGrid_SetLabelTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetLabelSize", (PyCFunction) _wrap_wxGrid_SetLabelSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetLabelBackgroundColour", (PyCFunction) _wrap_wxGrid_SetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetLabelAlignment", (PyCFunction) _wrap_wxGrid_SetLabelAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetGridCursor", (PyCFunction) _wrap_wxGrid_SetGridCursor, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetEditable", (PyCFunction) _wrap_wxGrid_SetEditable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetDividerPen", (PyCFunction) _wrap_wxGrid_SetDividerPen, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetColumnWidth", (PyCFunction) _wrap_wxGrid_SetColumnWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetCellValue", (PyCFunction) _wrap_wxGrid_SetCellValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetDefCellTextFont", (PyCFunction) _wrap_wxGrid_SetDefCellTextFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetCellTextFont", (PyCFunction) _wrap_wxGrid_SetCellTextFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetDefCellTextColour", (PyCFunction) _wrap_wxGrid_SetDefCellTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetCellTextColour", (PyCFunction) _wrap_wxGrid_SetCellTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetDefCellBackgroundColour", (PyCFunction) _wrap_wxGrid_SetDefCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetCellBackgroundColour", (PyCFunction) _wrap_wxGrid_SetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetDefCellAlignment", (PyCFunction) _wrap_wxGrid_SetDefCellAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_SetCellAlignment", (PyCFunction) _wrap_wxGrid_SetCellAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_OnActivate", (PyCFunction) _wrap_wxGrid_OnActivate, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_InsertRows", (PyCFunction) _wrap_wxGrid_InsertRows, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_InsertCols", (PyCFunction) _wrap_wxGrid_InsertCols, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetVertScrollBar", (PyCFunction) _wrap_wxGrid_GetVertScrollBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetTextItem", (PyCFunction) _wrap_wxGrid_GetTextItem, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetScrollPosY", (PyCFunction) _wrap_wxGrid_GetScrollPosY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetScrollPosX", (PyCFunction) _wrap_wxGrid_GetScrollPosX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetRows", (PyCFunction) _wrap_wxGrid_GetRows, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetRowHeight", (PyCFunction) _wrap_wxGrid_GetRowHeight, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetLabelValue", (PyCFunction) _wrap_wxGrid_GetLabelValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetLabelTextFont", (PyCFunction) _wrap_wxGrid_GetLabelTextFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetLabelTextColour", (PyCFunction) _wrap_wxGrid_GetLabelTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetLabelSize", (PyCFunction) _wrap_wxGrid_GetLabelSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetLabelBackgroundColour", (PyCFunction) _wrap_wxGrid_GetLabelBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetLabelAlignment", (PyCFunction) _wrap_wxGrid_GetLabelAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetHorizScrollBar", (PyCFunction) _wrap_wxGrid_GetHorizScrollBar, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetEditable", (PyCFunction) _wrap_wxGrid_GetEditable, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCursorRow", (PyCFunction) _wrap_wxGrid_GetCursorRow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCursorColumn", (PyCFunction) _wrap_wxGrid_GetCursorColumn, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCurrentRect", (PyCFunction) _wrap_wxGrid_GetCurrentRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetColumnWidth", (PyCFunction) _wrap_wxGrid_GetColumnWidth, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCols", (PyCFunction) _wrap_wxGrid_GetCols, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCellValue", (PyCFunction) _wrap_wxGrid_GetCellValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetDefCellTextFont", (PyCFunction) _wrap_wxGrid_GetDefCellTextFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCellTextFont", (PyCFunction) _wrap_wxGrid_GetCellTextFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetDefCellTextColour", (PyCFunction) _wrap_wxGrid_GetDefCellTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCellTextColour", (PyCFunction) _wrap_wxGrid_GetCellTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCells", (PyCFunction) _wrap_wxGrid_GetCells, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetDefCellBackgroundColour", (PyCFunction) _wrap_wxGrid_GetDefCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCellBackgroundColour", (PyCFunction) _wrap_wxGrid_GetCellBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetDefCellAlignment", (PyCFunction) _wrap_wxGrid_GetDefCellAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCellAlignment", (PyCFunction) _wrap_wxGrid_GetCellAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetCell", (PyCFunction) _wrap_wxGrid_GetCell, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_GetBatchCount", (PyCFunction) _wrap_wxGrid_GetBatchCount, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_EndBatch", (PyCFunction) _wrap_wxGrid_EndBatch, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_DeleteRows", (PyCFunction) _wrap_wxGrid_DeleteRows, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_DeleteCols", (PyCFunction) _wrap_wxGrid_DeleteCols, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_CurrentCellVisible", (PyCFunction) _wrap_wxGrid_CurrentCellVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_CreateGrid", (PyCFunction) _wrap_wxGrid_CreateGrid, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_CellHitTest", (PyCFunction) _wrap_wxGrid_CellHitTest, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_BeginBatch", (PyCFunction) _wrap_wxGrid_BeginBatch, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_AppendRows", (PyCFunction) _wrap_wxGrid_AppendRows, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_AppendCols", (PyCFunction) _wrap_wxGrid_AppendCols, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGrid_AdjustScrollbars", (PyCFunction) _wrap_wxGrid_AdjustScrollbars, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxGrid", (PyCFunction) _wrap_new_wxGrid, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_SetCellBitmap", (PyCFunction) _wrap_wxGridCell_SetCellBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_GetCellBitmap", (PyCFunction) _wrap_wxGridCell_GetCellBitmap, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_SetAlignment", (PyCFunction) _wrap_wxGridCell_SetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_GetAlignment", (PyCFunction) _wrap_wxGridCell_GetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_GetBackgroundBrush", (PyCFunction) _wrap_wxGridCell_GetBackgroundBrush, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_SetBackgroundColour", (PyCFunction) _wrap_wxGridCell_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_GetBackgroundColour", (PyCFunction) _wrap_wxGridCell_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_SetTextColour", (PyCFunction) _wrap_wxGridCell_SetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_GetTextColour", (PyCFunction) _wrap_wxGridCell_GetTextColour, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_SetFont", (PyCFunction) _wrap_wxGridCell_SetFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_GetFont", (PyCFunction) _wrap_wxGridCell_GetFont, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_SetTextValue", (PyCFunction) _wrap_wxGridCell_SetTextValue, METH_VARARGS | METH_KEYWORDS },
+	 { "wxGridCell_GetTextValue", (PyCFunction) _wrap_wxGridCell_GetTextValue, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxGridCell", (PyCFunction) _wrap_delete_wxGridCell, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxGridCell", (PyCFunction) _wrap_new_wxGridCell, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/windows3.cpp b/utils/wxPython/src/msw/windows3.cpp
index 68fd76920c..e227039a48 100644
--- a/utils/wxPython/src/msw/windows3.cpp
+++ b/utils/wxPython/src/msw/windows3.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -136,14 +136,15 @@ static void *SwigwxSashEventTowxEvent(void *ptr) {
 }
 
 #define wxSashEvent_SetEdge(_swigobj,_swigarg0)  (_swigobj->SetEdge(_swigarg0))
-static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxSashEdgePosition  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","edge", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashEvent_SetEdge",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashEvent_SetEdge",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -163,14 +164,15 @@ static PyObject *_wrap_wxSashEvent_SetEdge(PyObject *self, PyObject *args) {
 }
 
 #define wxSashEvent_GetEdge(_swigobj)  (_swigobj->GetEdge())
-static PyObject *_wrap_wxSashEvent_GetEdge(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashEvent_GetEdge(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashEdgePosition  _result;
     wxSashEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashEvent_GetEdge",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashEvent_GetEdge",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -189,15 +191,16 @@ static PyObject *_wrap_wxSashEvent_GetEdge(PyObject *self, PyObject *args) {
 }
 
 #define wxSashEvent_SetDragRect(_swigobj,_swigarg0)  (_swigobj->SetDragRect(_swigarg0))
-static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxRect * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxSashEvent_SetDragRect",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSashEvent_SetDragRect",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -224,15 +227,16 @@ static PyObject *_wrap_wxSashEvent_SetDragRect(PyObject *self, PyObject *args) {
 }
 
 #define wxSashEvent_GetDragRect(_swigobj)  (_swigobj->GetDragRect())
-static PyObject *_wrap_wxSashEvent_GetDragRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashEvent_GetDragRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxSashEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashEvent_GetDragRect",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashEvent_GetDragRect",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -252,14 +256,15 @@ static PyObject *_wrap_wxSashEvent_GetDragRect(PyObject *self, PyObject *args) {
 }
 
 #define wxSashEvent_SetDragStatus(_swigobj,_swigarg0)  (_swigobj->SetDragStatus(_swigarg0))
-static PyObject *_wrap_wxSashEvent_SetDragStatus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashEvent_SetDragStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashEvent * _arg0;
     wxSashDragStatus  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","status", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashEvent_SetDragStatus",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashEvent_SetDragStatus",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -279,14 +284,15 @@ static PyObject *_wrap_wxSashEvent_SetDragStatus(PyObject *self, PyObject *args)
 }
 
 #define wxSashEvent_GetDragStatus(_swigobj)  (_swigobj->GetDragStatus())
-static PyObject *_wrap_wxSashEvent_GetDragStatus(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashEvent_GetDragStatus(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashDragStatus  _result;
     wxSashEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashEvent_GetDragStatus",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashEvent_GetDragStatus",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -321,7 +327,7 @@ static void *SwigwxSashWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxSashWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSashWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _result;
     wxWindow * _arg0;
@@ -333,10 +339,11 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxSashWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSashWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -375,15 +382,16 @@ static PyObject *_wrap_new_wxSashWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxSashWindow_GetSashVisible(_swigobj,_swigarg0)  (_swigobj->GetSashVisible(_swigarg0))
-static PyObject *_wrap_wxSashWindow_GetSashVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetSashVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","edge", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_GetSashVisible",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_GetSashVisible",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -402,14 +410,15 @@ static PyObject *_wrap_wxSashWindow_GetSashVisible(PyObject *self, PyObject *arg
 }
 
 #define wxSashWindow_GetDefaultBorderSize(_swigobj)  (_swigobj->GetDefaultBorderSize())
-static PyObject *_wrap_wxSashWindow_GetDefaultBorderSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetDefaultBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetDefaultBorderSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashWindow_GetDefaultBorderSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -428,15 +437,16 @@ static PyObject *_wrap_wxSashWindow_GetDefaultBorderSize(PyObject *self, PyObjec
 }
 
 #define wxSashWindow_GetEdgeMargin(_swigobj,_swigarg0)  (_swigobj->GetEdgeMargin(_swigarg0))
-static PyObject *_wrap_wxSashWindow_GetEdgeMargin(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetEdgeMargin(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","edge", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_GetEdgeMargin",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_GetEdgeMargin",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -455,14 +465,15 @@ static PyObject *_wrap_wxSashWindow_GetEdgeMargin(PyObject *self, PyObject *args
 }
 
 #define wxSashWindow_GetExtraBorderSize(_swigobj)  (_swigobj->GetExtraBorderSize())
-static PyObject *_wrap_wxSashWindow_GetExtraBorderSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetExtraBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetExtraBorderSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashWindow_GetExtraBorderSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -481,14 +492,15 @@ static PyObject *_wrap_wxSashWindow_GetExtraBorderSize(PyObject *self, PyObject
 }
 
 #define wxSashWindow_GetMaximumSizeX(_swigobj)  (_swigobj->GetMaximumSizeX())
-static PyObject *_wrap_wxSashWindow_GetMaximumSizeX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetMaximumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMaximumSizeX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashWindow_GetMaximumSizeX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -507,14 +519,15 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeX(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_GetMaximumSizeY(_swigobj)  (_swigobj->GetMaximumSizeY())
-static PyObject *_wrap_wxSashWindow_GetMaximumSizeY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetMaximumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMaximumSizeY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashWindow_GetMaximumSizeY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -533,14 +546,15 @@ static PyObject *_wrap_wxSashWindow_GetMaximumSizeY(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_GetMinimumSizeX(_swigobj)  (_swigobj->GetMinimumSizeX())
-static PyObject *_wrap_wxSashWindow_GetMinimumSizeX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetMinimumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMinimumSizeX",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashWindow_GetMinimumSizeX",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -559,14 +573,15 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeX(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_GetMinimumSizeY(_swigobj)  (_swigobj->GetMinimumSizeY())
-static PyObject *_wrap_wxSashWindow_GetMinimumSizeY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_GetMinimumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxSashWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashWindow_GetMinimumSizeY",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashWindow_GetMinimumSizeY",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -585,15 +600,16 @@ static PyObject *_wrap_wxSashWindow_GetMinimumSizeY(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_HasBorder(_swigobj,_swigarg0)  (_swigobj->HasBorder(_swigarg0))
-static PyObject *_wrap_wxSashWindow_HasBorder(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_HasBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","edge", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_HasBorder",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_HasBorder",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -612,14 +628,15 @@ static PyObject *_wrap_wxSashWindow_HasBorder(PyObject *self, PyObject *args) {
 }
 
 #define wxSashWindow_SetDefaultBorderSize(_swigobj,_swigarg0)  (_swigobj->SetDefaultBorderSize(_swigarg0))
-static PyObject *_wrap_wxSashWindow_SetDefaultBorderSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetDefaultBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetDefaultBorderSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_SetDefaultBorderSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -639,14 +656,15 @@ static PyObject *_wrap_wxSashWindow_SetDefaultBorderSize(PyObject *self, PyObjec
 }
 
 #define wxSashWindow_SetExtraBorderSize(_swigobj,_swigarg0)  (_swigobj->SetExtraBorderSize(_swigarg0))
-static PyObject *_wrap_wxSashWindow_SetExtraBorderSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetExtraBorderSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","width", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetExtraBorderSize",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_SetExtraBorderSize",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -666,14 +684,15 @@ static PyObject *_wrap_wxSashWindow_SetExtraBorderSize(PyObject *self, PyObject
 }
 
 #define wxSashWindow_SetMaximumSizeX(_swigobj,_swigarg0)  (_swigobj->SetMaximumSizeX(_swigarg0))
-static PyObject *_wrap_wxSashWindow_SetMaximumSizeX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetMaximumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMaximumSizeX",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_SetMaximumSizeX",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -693,14 +712,15 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeX(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_SetMaximumSizeY(_swigobj,_swigarg0)  (_swigobj->SetMaximumSizeY(_swigarg0))
-static PyObject *_wrap_wxSashWindow_SetMaximumSizeY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetMaximumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMaximumSizeY",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_SetMaximumSizeY",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -720,14 +740,15 @@ static PyObject *_wrap_wxSashWindow_SetMaximumSizeY(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_SetMinimumSizeX(_swigobj,_swigarg0)  (_swigobj->SetMinimumSizeX(_swigarg0))
-static PyObject *_wrap_wxSashWindow_SetMinimumSizeX(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetMinimumSizeX(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMinimumSizeX",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_SetMinimumSizeX",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -747,14 +768,15 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeX(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_SetMinimumSizeY(_swigobj,_swigarg0)  (_swigobj->SetMinimumSizeY(_swigarg0))
-static PyObject *_wrap_wxSashWindow_SetMinimumSizeY(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetMinimumSizeY(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","min", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashWindow_SetMinimumSizeY",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashWindow_SetMinimumSizeY",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -774,16 +796,17 @@ static PyObject *_wrap_wxSashWindow_SetMinimumSizeY(PyObject *self, PyObject *ar
 }
 
 #define wxSashWindow_SetSashVisible(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSashVisible(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSashWindow_SetSashVisible(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetSashVisible(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","edge","visible", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSashWindow_SetSashVisible",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSashWindow_SetSashVisible",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -804,16 +827,17 @@ static PyObject *_wrap_wxSashWindow_SetSashVisible(PyObject *self, PyObject *arg
 }
 
 #define wxSashWindow_SetSashBorder(_swigobj,_swigarg0,_swigarg1)  (_swigobj->SetSashBorder(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxSashWindow_SetSashBorder(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashWindow_SetSashBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashWindow * _arg0;
     wxSashEdgePosition  _arg1;
     bool  _arg2;
     PyObject * _argo0 = 0;
     int tempbool2;
+    char *_kwnames[] = { "self","edge","hasBorder", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oii:wxSashWindow_SetSashBorder",&_argo0,&_arg1,&tempbool2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSashWindow_SetSashBorder",_kwnames,&_argo0,&_arg1,&tempbool2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -842,14 +866,15 @@ static void *SwigwxQueryLayoutInfoEventTowxEvent(void *ptr) {
 }
 
 #define wxQueryLayoutInfoEvent_SetRequestedLength(_swigobj,_swigarg0)  (_swigobj->SetRequestedLength(_swigarg0))
-static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","length", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetRequestedLength",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxQueryLayoutInfoEvent_SetRequestedLength",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -869,14 +894,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetRequestedLength(PyObject *self,
 }
 
 #define wxQueryLayoutInfoEvent_GetRequestedLength(_swigobj)  (_swigobj->GetRequestedLength())
-static PyObject *_wrap_wxQueryLayoutInfoEvent_GetRequestedLength(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_GetRequestedLength(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetRequestedLength",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxQueryLayoutInfoEvent_GetRequestedLength",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -895,14 +921,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetRequestedLength(PyObject *self,
 }
 
 #define wxQueryLayoutInfoEvent_SetFlags(_swigobj,_swigarg0)  (_swigobj->SetFlags(_swigarg0))
-static PyObject *_wrap_wxQueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","flags", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetFlags",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxQueryLayoutInfoEvent_SetFlags",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -922,14 +949,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetFlags(PyObject *self, PyObject
 }
 
 #define wxQueryLayoutInfoEvent_GetFlags(_swigobj)  (_swigobj->GetFlags())
-static PyObject *_wrap_wxQueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetFlags",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxQueryLayoutInfoEvent_GetFlags",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -948,15 +976,16 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetFlags(PyObject *self, PyObject
 }
 
 #define wxQueryLayoutInfoEvent_SetSize(_swigobj,_swigarg0)  (_swigobj->SetSize(_swigarg0))
-static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxQueryLayoutInfoEvent_SetSize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxQueryLayoutInfoEvent_SetSize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -983,15 +1012,16 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetSize(PyObject *self, PyObject *
 }
 
 #define wxQueryLayoutInfoEvent_GetSize(_swigobj)  (_swigobj->GetSize())
-static PyObject *_wrap_wxQueryLayoutInfoEvent_GetSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_GetSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSize * _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetSize",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxQueryLayoutInfoEvent_GetSize",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1011,14 +1041,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetSize(PyObject *self, PyObject *
 }
 
 #define wxQueryLayoutInfoEvent_SetOrientation(_swigobj,_swigarg0)  (_swigobj->SetOrientation(_swigarg0))
-static PyObject *_wrap_wxQueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxLayoutOrientation  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orient", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetOrientation",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxQueryLayoutInfoEvent_SetOrientation",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1038,14 +1069,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetOrientation(PyObject *self, PyO
 }
 
 #define wxQueryLayoutInfoEvent_GetOrientation(_swigobj)  (_swigobj->GetOrientation())
-static PyObject *_wrap_wxQueryLayoutInfoEvent_GetOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutOrientation  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetOrientation",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxQueryLayoutInfoEvent_GetOrientation",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1064,14 +1096,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_GetOrientation(PyObject *self, PyO
 }
 
 #define wxQueryLayoutInfoEvent_SetAlignment(_swigobj,_swigarg0)  (_swigobj->SetAlignment(_swigarg0))
-static PyObject *_wrap_wxQueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxQueryLayoutInfoEvent * _arg0;
     wxLayoutAlignment  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","align", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxQueryLayoutInfoEvent_SetAlignment",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxQueryLayoutInfoEvent_SetAlignment",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1091,14 +1124,15 @@ static PyObject *_wrap_wxQueryLayoutInfoEvent_SetAlignment(PyObject *self, PyObj
 }
 
 #define wxQueryLayoutInfoEvent_GetAlignment(_swigobj)  (_swigobj->GetAlignment())
-static PyObject *_wrap_wxQueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxQueryLayoutInfoEvent_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutAlignment  _result;
     wxQueryLayoutInfoEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxQueryLayoutInfoEvent_GetAlignment",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxQueryLayoutInfoEvent_GetAlignment",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1125,14 +1159,15 @@ static void *SwigwxCalculateLayoutEventTowxEvent(void *ptr) {
 }
 
 #define wxCalculateLayoutEvent_SetFlags(_swigobj,_swigarg0)  (_swigobj->SetFlags(_swigarg0))
-static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCalculateLayoutEvent * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","flags", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxCalculateLayoutEvent_SetFlags",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxCalculateLayoutEvent_SetFlags",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1152,14 +1187,15 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetFlags(PyObject *self, PyObject
 }
 
 #define wxCalculateLayoutEvent_GetFlags(_swigobj)  (_swigobj->GetFlags())
-static PyObject *_wrap_wxCalculateLayoutEvent_GetFlags(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCalculateLayoutEvent_GetFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxCalculateLayoutEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCalculateLayoutEvent_GetFlags",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCalculateLayoutEvent_GetFlags",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1178,15 +1214,16 @@ static PyObject *_wrap_wxCalculateLayoutEvent_GetFlags(PyObject *self, PyObject
 }
 
 #define wxCalculateLayoutEvent_SetRect(_swigobj,_swigarg0)  (_swigobj->SetRect(_swigarg0))
-static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxCalculateLayoutEvent * _arg0;
     wxRect * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxCalculateLayoutEvent_SetRect",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxCalculateLayoutEvent_SetRect",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1213,15 +1250,16 @@ static PyObject *_wrap_wxCalculateLayoutEvent_SetRect(PyObject *self, PyObject *
 }
 
 #define wxCalculateLayoutEvent_GetRect(_swigobj)  (_swigobj->GetRect())
-static PyObject *_wrap_wxCalculateLayoutEvent_GetRect(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxCalculateLayoutEvent_GetRect(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxRect * _result;
     wxCalculateLayoutEvent * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxCalculateLayoutEvent_GetRect",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxCalculateLayoutEvent_GetRect",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1265,7 +1303,7 @@ static void *SwigwxSashLayoutWindowTowxEvtHandler(void *ptr) {
 }
 
 #define new_wxSashLayoutWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSashLayoutWindow(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
-static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashLayoutWindow * _result;
     wxWindow * _arg0;
@@ -1277,10 +1315,11 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args) {
     PyObject * _argo0 = 0;
     PyObject * _argo2 = 0;
     PyObject * _argo3 = 0;
+    char *_kwnames[] = { "parent","id","pos","size","style","name", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi|OOls:new_wxSashLayoutWindow",&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxSashLayoutWindow",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_arg5)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1319,14 +1358,15 @@ static PyObject *_wrap_new_wxSashLayoutWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxSashLayoutWindow_GetAlignment(_swigobj)  (_swigobj->GetAlignment())
-static PyObject *_wrap_wxSashLayoutWindow_GetAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashLayoutWindow_GetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutAlignment  _result;
     wxSashLayoutWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashLayoutWindow_GetAlignment",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashLayoutWindow_GetAlignment",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1345,14 +1385,15 @@ static PyObject *_wrap_wxSashLayoutWindow_GetAlignment(PyObject *self, PyObject
 }
 
 #define wxSashLayoutWindow_GetOrientation(_swigobj)  (_swigobj->GetOrientation())
-static PyObject *_wrap_wxSashLayoutWindow_GetOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashLayoutWindow_GetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutOrientation  _result;
     wxSashLayoutWindow * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxSashLayoutWindow_GetOrientation",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSashLayoutWindow_GetOrientation",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1371,14 +1412,15 @@ static PyObject *_wrap_wxSashLayoutWindow_GetOrientation(PyObject *self, PyObjec
 }
 
 #define wxSashLayoutWindow_SetAlignment(_swigobj,_swigarg0)  (_swigobj->SetAlignment(_swigarg0))
-static PyObject *_wrap_wxSashLayoutWindow_SetAlignment(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashLayoutWindow_SetAlignment(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxLayoutAlignment  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","alignment", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashLayoutWindow_SetAlignment",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashLayoutWindow_SetAlignment",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1398,15 +1440,16 @@ static PyObject *_wrap_wxSashLayoutWindow_SetAlignment(PyObject *self, PyObject
 }
 
 #define wxSashLayoutWindow_SetDefaultSize(_swigobj,_swigarg0)  (_swigobj->SetDefaultSize(_swigarg0))
-static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxSize * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","size", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxSashLayoutWindow_SetDefaultSize",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSashLayoutWindow_SetDefaultSize",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1433,14 +1476,15 @@ static PyObject *_wrap_wxSashLayoutWindow_SetDefaultSize(PyObject *self, PyObjec
 }
 
 #define wxSashLayoutWindow_SetOrientation(_swigobj,_swigarg0)  (_swigobj->SetOrientation(_swigarg0))
-static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxSashLayoutWindow * _arg0;
     wxLayoutOrientation  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","orientation", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxSashLayoutWindow_SetOrientation",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSashLayoutWindow_SetOrientation",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1460,13 +1504,14 @@ static PyObject *_wrap_wxSashLayoutWindow_SetOrientation(PyObject *self, PyObjec
 }
 
 #define new_wxLayoutAlgorithm() (new wxLayoutAlgorithm())
-static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutAlgorithm * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxLayoutAlgorithm")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxLayoutAlgorithm",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1484,13 +1529,14 @@ static PyObject *_wrap_new_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxLayoutAlgorithm(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxLayoutAlgorithm * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxLayoutAlgorithm",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxLayoutAlgorithm",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1510,7 +1556,7 @@ static PyObject *_wrap_delete_wxLayoutAlgorithm(PyObject *self, PyObject *args)
 }
 
 #define wxLayoutAlgorithm_LayoutMDIFrame(_swigobj,_swigarg0,_swigarg1)  (_swigobj->LayoutMDIFrame(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxLayoutAlgorithm * _arg0;
@@ -1519,9 +1565,10 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","frame","rect", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|O:wxLayoutAlgorithm_LayoutMDIFrame",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxLayoutAlgorithm_LayoutMDIFrame",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1554,7 +1601,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutMDIFrame(PyObject *self, PyObject
 }
 
 #define wxLayoutAlgorithm_LayoutFrame(_swigobj,_swigarg0,_swigarg1)  (_swigobj->LayoutFrame(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxLayoutAlgorithm * _arg0;
@@ -1563,9 +1610,10 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *a
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","frame","mainWindow", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|O:wxLayoutAlgorithm_LayoutFrame",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxLayoutAlgorithm_LayoutFrame",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1598,7 +1646,7 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutFrame(PyObject *self, PyObject *a
 }
 
 #define wxLayoutAlgorithm_LayoutWindow(_swigobj,_swigarg0,_swigarg1)  (_swigobj->LayoutWindow(_swigarg0,_swigarg1))
-static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxLayoutAlgorithm * _arg0;
@@ -1607,9 +1655,10 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
     PyObject * _argo2 = 0;
+    char *_kwnames[] = { "self","parent","mainWindow", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|O:wxLayoutAlgorithm_LayoutWindow",&_argo0,&_argo1,&_argo2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|O:wxLayoutAlgorithm_LayoutWindow",_kwnames,&_argo0,&_argo1,&_argo2)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1642,55 +1691,55 @@ static PyObject *_wrap_wxLayoutAlgorithm_LayoutWindow(PyObject *self, PyObject *
 }
 
 static PyMethodDef windows3cMethods[] = {
-	 { "wxLayoutAlgorithm_LayoutWindow", _wrap_wxLayoutAlgorithm_LayoutWindow, METH_VARARGS },
-	 { "wxLayoutAlgorithm_LayoutFrame", _wrap_wxLayoutAlgorithm_LayoutFrame, METH_VARARGS },
-	 { "wxLayoutAlgorithm_LayoutMDIFrame", _wrap_wxLayoutAlgorithm_LayoutMDIFrame, METH_VARARGS },
-	 { "delete_wxLayoutAlgorithm", _wrap_delete_wxLayoutAlgorithm, METH_VARARGS },
-	 { "new_wxLayoutAlgorithm", _wrap_new_wxLayoutAlgorithm, METH_VARARGS },
-	 { "wxSashLayoutWindow_SetOrientation", _wrap_wxSashLayoutWindow_SetOrientation, METH_VARARGS },
-	 { "wxSashLayoutWindow_SetDefaultSize", _wrap_wxSashLayoutWindow_SetDefaultSize, METH_VARARGS },
-	 { "wxSashLayoutWindow_SetAlignment", _wrap_wxSashLayoutWindow_SetAlignment, METH_VARARGS },
-	 { "wxSashLayoutWindow_GetOrientation", _wrap_wxSashLayoutWindow_GetOrientation, METH_VARARGS },
-	 { "wxSashLayoutWindow_GetAlignment", _wrap_wxSashLayoutWindow_GetAlignment, METH_VARARGS },
-	 { "new_wxSashLayoutWindow", _wrap_new_wxSashLayoutWindow, METH_VARARGS },
-	 { "wxCalculateLayoutEvent_GetRect", _wrap_wxCalculateLayoutEvent_GetRect, METH_VARARGS },
-	 { "wxCalculateLayoutEvent_SetRect", _wrap_wxCalculateLayoutEvent_SetRect, METH_VARARGS },
-	 { "wxCalculateLayoutEvent_GetFlags", _wrap_wxCalculateLayoutEvent_GetFlags, METH_VARARGS },
-	 { "wxCalculateLayoutEvent_SetFlags", _wrap_wxCalculateLayoutEvent_SetFlags, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_GetAlignment", _wrap_wxQueryLayoutInfoEvent_GetAlignment, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_SetAlignment", _wrap_wxQueryLayoutInfoEvent_SetAlignment, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_GetOrientation", _wrap_wxQueryLayoutInfoEvent_GetOrientation, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_SetOrientation", _wrap_wxQueryLayoutInfoEvent_SetOrientation, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_GetSize", _wrap_wxQueryLayoutInfoEvent_GetSize, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_SetSize", _wrap_wxQueryLayoutInfoEvent_SetSize, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_GetFlags", _wrap_wxQueryLayoutInfoEvent_GetFlags, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_SetFlags", _wrap_wxQueryLayoutInfoEvent_SetFlags, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_GetRequestedLength", _wrap_wxQueryLayoutInfoEvent_GetRequestedLength, METH_VARARGS },
-	 { "wxQueryLayoutInfoEvent_SetRequestedLength", _wrap_wxQueryLayoutInfoEvent_SetRequestedLength, METH_VARARGS },
-	 { "wxSashWindow_SetSashBorder", _wrap_wxSashWindow_SetSashBorder, METH_VARARGS },
-	 { "wxSashWindow_SetSashVisible", _wrap_wxSashWindow_SetSashVisible, METH_VARARGS },
-	 { "wxSashWindow_SetMinimumSizeY", _wrap_wxSashWindow_SetMinimumSizeY, METH_VARARGS },
-	 { "wxSashWindow_SetMinimumSizeX", _wrap_wxSashWindow_SetMinimumSizeX, METH_VARARGS },
-	 { "wxSashWindow_SetMaximumSizeY", _wrap_wxSashWindow_SetMaximumSizeY, METH_VARARGS },
-	 { "wxSashWindow_SetMaximumSizeX", _wrap_wxSashWindow_SetMaximumSizeX, METH_VARARGS },
-	 { "wxSashWindow_SetExtraBorderSize", _wrap_wxSashWindow_SetExtraBorderSize, METH_VARARGS },
-	 { "wxSashWindow_SetDefaultBorderSize", _wrap_wxSashWindow_SetDefaultBorderSize, METH_VARARGS },
-	 { "wxSashWindow_HasBorder", _wrap_wxSashWindow_HasBorder, METH_VARARGS },
-	 { "wxSashWindow_GetMinimumSizeY", _wrap_wxSashWindow_GetMinimumSizeY, METH_VARARGS },
-	 { "wxSashWindow_GetMinimumSizeX", _wrap_wxSashWindow_GetMinimumSizeX, METH_VARARGS },
-	 { "wxSashWindow_GetMaximumSizeY", _wrap_wxSashWindow_GetMaximumSizeY, METH_VARARGS },
-	 { "wxSashWindow_GetMaximumSizeX", _wrap_wxSashWindow_GetMaximumSizeX, METH_VARARGS },
-	 { "wxSashWindow_GetExtraBorderSize", _wrap_wxSashWindow_GetExtraBorderSize, METH_VARARGS },
-	 { "wxSashWindow_GetEdgeMargin", _wrap_wxSashWindow_GetEdgeMargin, METH_VARARGS },
-	 { "wxSashWindow_GetDefaultBorderSize", _wrap_wxSashWindow_GetDefaultBorderSize, METH_VARARGS },
-	 { "wxSashWindow_GetSashVisible", _wrap_wxSashWindow_GetSashVisible, METH_VARARGS },
-	 { "new_wxSashWindow", _wrap_new_wxSashWindow, METH_VARARGS },
-	 { "wxSashEvent_GetDragStatus", _wrap_wxSashEvent_GetDragStatus, METH_VARARGS },
-	 { "wxSashEvent_SetDragStatus", _wrap_wxSashEvent_SetDragStatus, METH_VARARGS },
-	 { "wxSashEvent_GetDragRect", _wrap_wxSashEvent_GetDragRect, METH_VARARGS },
-	 { "wxSashEvent_SetDragRect", _wrap_wxSashEvent_SetDragRect, METH_VARARGS },
-	 { "wxSashEvent_GetEdge", _wrap_wxSashEvent_GetEdge, METH_VARARGS },
-	 { "wxSashEvent_SetEdge", _wrap_wxSashEvent_SetEdge, METH_VARARGS },
+	 { "wxLayoutAlgorithm_LayoutWindow", (PyCFunction) _wrap_wxLayoutAlgorithm_LayoutWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutAlgorithm_LayoutFrame", (PyCFunction) _wrap_wxLayoutAlgorithm_LayoutFrame, METH_VARARGS | METH_KEYWORDS },
+	 { "wxLayoutAlgorithm_LayoutMDIFrame", (PyCFunction) _wrap_wxLayoutAlgorithm_LayoutMDIFrame, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxLayoutAlgorithm", (PyCFunction) _wrap_delete_wxLayoutAlgorithm, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxLayoutAlgorithm", (PyCFunction) _wrap_new_wxLayoutAlgorithm, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashLayoutWindow_SetOrientation", (PyCFunction) _wrap_wxSashLayoutWindow_SetOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashLayoutWindow_SetDefaultSize", (PyCFunction) _wrap_wxSashLayoutWindow_SetDefaultSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashLayoutWindow_SetAlignment", (PyCFunction) _wrap_wxSashLayoutWindow_SetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashLayoutWindow_GetOrientation", (PyCFunction) _wrap_wxSashLayoutWindow_GetOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashLayoutWindow_GetAlignment", (PyCFunction) _wrap_wxSashLayoutWindow_GetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSashLayoutWindow", (PyCFunction) _wrap_new_wxSashLayoutWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCalculateLayoutEvent_GetRect", (PyCFunction) _wrap_wxCalculateLayoutEvent_GetRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCalculateLayoutEvent_SetRect", (PyCFunction) _wrap_wxCalculateLayoutEvent_SetRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCalculateLayoutEvent_GetFlags", (PyCFunction) _wrap_wxCalculateLayoutEvent_GetFlags, METH_VARARGS | METH_KEYWORDS },
+	 { "wxCalculateLayoutEvent_SetFlags", (PyCFunction) _wrap_wxCalculateLayoutEvent_SetFlags, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_GetAlignment", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_GetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_SetAlignment", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_SetAlignment, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_GetOrientation", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_GetOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_SetOrientation", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_SetOrientation, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_GetSize", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_GetSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_SetSize", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_SetSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_GetFlags", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_GetFlags, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_SetFlags", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_SetFlags, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_GetRequestedLength", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_GetRequestedLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxQueryLayoutInfoEvent_SetRequestedLength", (PyCFunction) _wrap_wxQueryLayoutInfoEvent_SetRequestedLength, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetSashBorder", (PyCFunction) _wrap_wxSashWindow_SetSashBorder, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetSashVisible", (PyCFunction) _wrap_wxSashWindow_SetSashVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetMinimumSizeY", (PyCFunction) _wrap_wxSashWindow_SetMinimumSizeY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetMinimumSizeX", (PyCFunction) _wrap_wxSashWindow_SetMinimumSizeX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetMaximumSizeY", (PyCFunction) _wrap_wxSashWindow_SetMaximumSizeY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetMaximumSizeX", (PyCFunction) _wrap_wxSashWindow_SetMaximumSizeX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetExtraBorderSize", (PyCFunction) _wrap_wxSashWindow_SetExtraBorderSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_SetDefaultBorderSize", (PyCFunction) _wrap_wxSashWindow_SetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_HasBorder", (PyCFunction) _wrap_wxSashWindow_HasBorder, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetMinimumSizeY", (PyCFunction) _wrap_wxSashWindow_GetMinimumSizeY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetMinimumSizeX", (PyCFunction) _wrap_wxSashWindow_GetMinimumSizeX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetMaximumSizeY", (PyCFunction) _wrap_wxSashWindow_GetMaximumSizeY, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetMaximumSizeX", (PyCFunction) _wrap_wxSashWindow_GetMaximumSizeX, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetExtraBorderSize", (PyCFunction) _wrap_wxSashWindow_GetExtraBorderSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetEdgeMargin", (PyCFunction) _wrap_wxSashWindow_GetEdgeMargin, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetDefaultBorderSize", (PyCFunction) _wrap_wxSashWindow_GetDefaultBorderSize, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashWindow_GetSashVisible", (PyCFunction) _wrap_wxSashWindow_GetSashVisible, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxSashWindow", (PyCFunction) _wrap_new_wxSashWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashEvent_GetDragStatus", (PyCFunction) _wrap_wxSashEvent_GetDragStatus, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashEvent_SetDragStatus", (PyCFunction) _wrap_wxSashEvent_SetDragStatus, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashEvent_GetDragRect", (PyCFunction) _wrap_wxSashEvent_GetDragRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashEvent_SetDragRect", (PyCFunction) _wrap_wxSashEvent_SetDragRect, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashEvent_GetEdge", (PyCFunction) _wrap_wxSashEvent_GetEdge, METH_VARARGS | METH_KEYWORDS },
+	 { "wxSashEvent_SetEdge", (PyCFunction) _wrap_wxSashEvent_SetEdge, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/msw/wx.cpp b/utils/wxPython/src/msw/wx.cpp
index 46af05e7ce..edb359c2da 100644
--- a/utils/wxPython/src/msw/wx.cpp
+++ b/utils/wxPython/src/msw/wx.cpp
@@ -3,7 +3,7 @@
  * 
  * This file was automatically generated by :
  * Simplified Wrapper and Interface Generator (SWIG)
- * Version 1.1 (Patch 6)
+ * Version 1.1 (Build 794)
  * 
  * Portions Copyright (c) 1995-1998
  * The University of Utah and The Regents of the University of California.
@@ -649,15 +649,16 @@ extern "C" SWIGEXPORT(void) initprintfwc();
 #ifdef __cplusplus
 extern "C" {
 #endif
-static PyObject *_wrap_ptrcast(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ptrcast(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     PyObject * _arg0;
     char * _arg1;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "ptr","type", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Os:ptrcast",&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Os:ptrcast",_kwnames,&_obj0,&_arg1)) 
         return NULL;
 {
   _arg0 = _obj0;
@@ -673,16 +674,17 @@ static PyObject *_wrap_ptrcast(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_ptrvalue(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ptrvalue(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     PyObject * _arg0;
     int  _arg1 = (int ) 0;
     char * _arg2 = (char *) 0;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "ptr","index","type", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O|is:ptrvalue",&_obj0,&_arg1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|is:ptrvalue",_kwnames,&_obj0,&_arg1,&_arg2)) 
         return NULL;
 {
   _arg0 = _obj0;
@@ -698,7 +700,7 @@ static PyObject *_wrap_ptrvalue(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_ptrset(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ptrset(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     PyObject * _arg0;
@@ -707,9 +709,10 @@ static PyObject *_wrap_ptrset(PyObject *self, PyObject *args) {
     char * _arg3 = (char *) 0;
     PyObject * _obj0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "ptr","value","index","type", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO|is:ptrset",&_obj0,&_obj1,&_arg2,&_arg3)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO|is:ptrset",_kwnames,&_obj0,&_obj1,&_arg2,&_arg3)) 
         return NULL;
 {
   _arg0 = _obj0;
@@ -728,16 +731,17 @@ static PyObject *_wrap_ptrset(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_ptrcreate(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ptrcreate(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     char * _arg0;
     PyObject * _arg1 = (PyObject *) 0;
     int  _arg2 = (int ) 1;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "type","value","nitems", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"s|Oi:ptrcreate",&_arg0,&_obj1,&_arg2)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s|Oi:ptrcreate",_kwnames,&_arg0,&_obj1,&_arg2)) 
         return NULL;
     if (_obj1)
 {
@@ -754,14 +758,15 @@ static PyObject *_wrap_ptrcreate(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_ptrfree(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ptrfree(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     PyObject * _arg0;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "ptr", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:ptrfree",&_obj0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:ptrfree",_kwnames,&_obj0)) 
         return NULL;
 {
   _arg0 = _obj0;
@@ -777,15 +782,16 @@ static PyObject *_wrap_ptrfree(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_ptradd(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ptradd(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     PyObject * _result;
     PyObject * _arg0;
     int  _arg1;
     PyObject * _obj0 = 0;
+    char *_kwnames[] = { "ptr","offset", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:ptradd",&_obj0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:ptradd",_kwnames,&_obj0,&_arg1)) 
         return NULL;
 {
   _arg0 = _obj0;
@@ -801,13 +807,14 @@ static PyObject *_wrap_ptradd(PyObject *self, PyObject *args) {
     return _resultobj;
 }
 
-static PyObject *_wrap_ptrmap(PyObject *self, PyObject *args) {
+static PyObject *_wrap_ptrmap(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     char * _arg0;
     char * _arg1;
+    char *_kwnames[] = { "type1","type2", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"ss:ptrmap",&_arg0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"ss:ptrmap",_kwnames,&_arg0,&_arg1)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -878,13 +885,14 @@ static wxPyApp *new_wxPyApp() {
             return wxPythonApp;
         }
 
-static PyObject *_wrap_new_wxPyApp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new_wxPyApp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new_wxPyApp")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxPyApp",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -902,13 +910,14 @@ static PyObject *_wrap_new_wxPyApp(PyObject *self, PyObject *args) {
 }
 
 #define delete_wxPyApp(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete_wxPyApp(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete_wxPyApp(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete_wxPyApp",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxPyApp",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -928,14 +937,15 @@ static PyObject *_wrap_delete_wxPyApp(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_GetAppName(_swigobj)  (_swigobj->GetAppName())
-static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetAppName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetAppName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -959,14 +969,15 @@ static PyObject *_wrap_wxPyApp_GetAppName(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_GetAuto3D(_swigobj)  (_swigobj->GetAuto3D())
-static PyObject *_wrap_wxPyApp_GetAuto3D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetAuto3D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetAuto3D",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetAuto3D",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -985,14 +996,15 @@ static PyObject *_wrap_wxPyApp_GetAuto3D(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_GetClassName(_swigobj)  (_swigobj->GetClassName())
-static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetClassName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetClassName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1016,14 +1028,15 @@ static PyObject *_wrap_wxPyApp_GetClassName(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_GetExitOnFrameDelete(_swigobj)  (_swigobj->GetExitOnFrameDelete())
-static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetExitOnFrameDelete",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetExitOnFrameDelete",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1042,14 +1055,15 @@ static PyObject *_wrap_wxPyApp_GetExitOnFrameDelete(PyObject *self, PyObject *ar
 }
 
 #define wxPyApp_GetPrintMode(_swigobj)  (_swigobj->GetPrintMode())
-static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetPrintMode",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetPrintMode",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1068,15 +1082,16 @@ static PyObject *_wrap_wxPyApp_GetPrintMode(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_GetTopWindow(_swigobj)  (_swigobj->GetTopWindow())
-static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxWindow * _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetTopWindow",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetTopWindow",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1101,14 +1116,15 @@ static PyObject *_wrap_wxPyApp_GetTopWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_GetVendorName(_swigobj)  (_swigobj->GetVendorName())
-static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxString * _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_GetVendorName",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_GetVendorName",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1132,13 +1148,14 @@ static PyObject *_wrap_wxPyApp_GetVendorName(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_Dispatch(_swigobj)  (_swigobj->Dispatch())
-static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_Dispatch",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_Dispatch",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1158,13 +1175,14 @@ static PyObject *_wrap_wxPyApp_Dispatch(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_ExitMainLoop(_swigobj)  (_swigobj->ExitMainLoop())
-static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_ExitMainLoop",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_ExitMainLoop",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1184,14 +1202,15 @@ static PyObject *_wrap_wxPyApp_ExitMainLoop(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_Initialized(_swigobj)  (_swigobj->Initialized())
-static PyObject *_wrap_wxPyApp_Initialized(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_Initialized(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_Initialized",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_Initialized",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1210,14 +1229,15 @@ static PyObject *_wrap_wxPyApp_Initialized(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_MainLoop(_swigobj)  (_swigobj->MainLoop())
-static PyObject *_wrap_wxPyApp_MainLoop(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_MainLoop(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     int  _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_MainLoop",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_MainLoop",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1236,14 +1256,15 @@ static PyObject *_wrap_wxPyApp_MainLoop(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_Pending(_swigobj)  (_swigobj->Pending())
-static PyObject *_wrap_wxPyApp_Pending(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_Pending(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_Pending",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_Pending",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1262,14 +1283,15 @@ static PyObject *_wrap_wxPyApp_Pending(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_ProcessIdle(_swigobj)  (_swigobj->ProcessIdle())
-static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     bool  _result;
     wxPyApp * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:wxPyApp_ProcessIdle",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxPyApp_ProcessIdle",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1288,15 +1310,16 @@ static PyObject *_wrap_wxPyApp_ProcessIdle(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_SetAppName(_swigobj,_swigarg0)  (_swigobj->SetAppName(_swigarg0))
-static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetAppName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyApp_SetAppName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1327,15 +1350,16 @@ static PyObject *_wrap_wxPyApp_SetAppName(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_SetAuto3D(_swigobj,_swigarg0)  (_swigobj->SetAuto3D(_swigarg0))
-static PyObject *_wrap_wxPyApp_SetAuto3D(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_SetAuto3D(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","auto3D", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_SetAuto3D",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyApp_SetAuto3D",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1356,15 +1380,16 @@ static PyObject *_wrap_wxPyApp_SetAuto3D(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_SetClassName(_swigobj,_swigarg0)  (_swigobj->SetClassName(_swigarg0))
-static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetClassName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyApp_SetClassName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1395,15 +1420,16 @@ static PyObject *_wrap_wxPyApp_SetClassName(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_SetExitOnFrameDelete(_swigobj,_swigarg0)  (_swigobj->SetExitOnFrameDelete(_swigarg0))
-static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     bool  _arg1;
     PyObject * _argo0 = 0;
     int tempbool1;
+    char *_kwnames[] = { "self","flag", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_SetExitOnFrameDelete",&_argo0,&tempbool1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyApp_SetExitOnFrameDelete",_kwnames,&_argo0,&tempbool1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1424,14 +1450,15 @@ static PyObject *_wrap_wxPyApp_SetExitOnFrameDelete(PyObject *self, PyObject *ar
 }
 
 #define wxPyApp_SetPrintMode(_swigobj,_swigarg0)  (_swigobj->SetPrintMode(_swigarg0))
-static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","mode", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_SetPrintMode",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyApp_SetPrintMode",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1451,15 +1478,16 @@ static PyObject *_wrap_wxPyApp_SetPrintMode(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_SetTopWindow(_swigobj,_swigarg0)  (_swigobj->SetTopWindow(_swigarg0))
-static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxWindow * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _argo1 = 0;
+    char *_kwnames[] = { "self","window", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetTopWindow",&_argo0,&_argo1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyApp_SetTopWindow",_kwnames,&_argo0,&_argo1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1486,15 +1514,16 @@ static PyObject *_wrap_wxPyApp_SetTopWindow(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_SetVendorName(_swigobj,_swigarg0)  (_swigobj->SetVendorName(_swigarg0))
-static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxPyApp * _arg0;
     wxString * _arg1;
     PyObject * _argo0 = 0;
     PyObject * _obj1 = 0;
+    char *_kwnames[] = { "self","name", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"OO:wxPyApp_SetVendorName",&_argo0,&_obj1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxPyApp_SetVendorName",_kwnames,&_argo0,&_obj1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1525,16 +1554,17 @@ static PyObject *_wrap_wxPyApp_SetVendorName(PyObject *self, PyObject *args) {
 }
 
 #define wxPyApp_GetStdIcon(_swigobj,_swigarg0)  (_swigobj->GetStdIcon(_swigarg0))
-static PyObject *_wrap_wxPyApp_GetStdIcon(PyObject *self, PyObject *args) {
+static PyObject *_wrap_wxPyApp_GetStdIcon(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     wxIcon * _result;
     wxPyApp * _arg0;
     int  _arg1;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self","which", NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,"Oi:wxPyApp_GetStdIcon",&_argo0,&_arg1)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyApp_GetStdIcon",_kwnames,&_argo0,&_arg1)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1554,13 +1584,14 @@ static PyObject *_wrap_wxPyApp_GetStdIcon(PyObject *self, PyObject *args) {
 }
 
 #define new___wxPyCleanup() (new __wxPyCleanup())
-static PyObject *_wrap_new___wxPyCleanup(PyObject *self, PyObject *args) {
+static PyObject *_wrap_new___wxPyCleanup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     __wxPyCleanup * _result;
+    char *_kwnames[] = {  NULL };
     char _ptemp[128];
 
     self = self;
-    if(!PyArg_ParseTuple(args,":new___wxPyCleanup")) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new___wxPyCleanup",_kwnames)) 
         return NULL;
 {
     wxPy_BEGIN_ALLOW_THREADS;
@@ -1578,13 +1609,14 @@ static PyObject *_wrap_new___wxPyCleanup(PyObject *self, PyObject *args) {
 }
 
 #define delete___wxPyCleanup(_swigobj) (delete _swigobj)
-static PyObject *_wrap_delete___wxPyCleanup(PyObject *self, PyObject *args) {
+static PyObject *_wrap_delete___wxPyCleanup(PyObject *self, PyObject *args, PyObject *kwargs) {
     PyObject * _resultobj;
     __wxPyCleanup * _arg0;
     PyObject * _argo0 = 0;
+    char *_kwnames[] = { "self", NULL };
 
     self = self;
-    if(!PyArg_ParseTuple(args,"O:delete___wxPyCleanup",&_argo0)) 
+    if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete___wxPyCleanup",_kwnames,&_argo0)) 
         return NULL;
     if (_argo0) {
         if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1604,40 +1636,40 @@ static PyObject *_wrap_delete___wxPyCleanup(PyObject *self, PyObject *args) {
 }
 
 static PyMethodDef wxcMethods[] = {
-	 { "delete___wxPyCleanup", _wrap_delete___wxPyCleanup, METH_VARARGS },
-	 { "new___wxPyCleanup", _wrap_new___wxPyCleanup, METH_VARARGS },
-	 { "wxPyApp_GetStdIcon", _wrap_wxPyApp_GetStdIcon, METH_VARARGS },
-	 { "wxPyApp_SetVendorName", _wrap_wxPyApp_SetVendorName, METH_VARARGS },
-	 { "wxPyApp_SetTopWindow", _wrap_wxPyApp_SetTopWindow, METH_VARARGS },
-	 { "wxPyApp_SetPrintMode", _wrap_wxPyApp_SetPrintMode, METH_VARARGS },
-	 { "wxPyApp_SetExitOnFrameDelete", _wrap_wxPyApp_SetExitOnFrameDelete, METH_VARARGS },
-	 { "wxPyApp_SetClassName", _wrap_wxPyApp_SetClassName, METH_VARARGS },
-	 { "wxPyApp_SetAuto3D", _wrap_wxPyApp_SetAuto3D, METH_VARARGS },
-	 { "wxPyApp_SetAppName", _wrap_wxPyApp_SetAppName, METH_VARARGS },
-	 { "wxPyApp_ProcessIdle", _wrap_wxPyApp_ProcessIdle, METH_VARARGS },
-	 { "wxPyApp_Pending", _wrap_wxPyApp_Pending, METH_VARARGS },
-	 { "wxPyApp_MainLoop", _wrap_wxPyApp_MainLoop, METH_VARARGS },
-	 { "wxPyApp_Initialized", _wrap_wxPyApp_Initialized, METH_VARARGS },
-	 { "wxPyApp_ExitMainLoop", _wrap_wxPyApp_ExitMainLoop, METH_VARARGS },
-	 { "wxPyApp_Dispatch", _wrap_wxPyApp_Dispatch, METH_VARARGS },
-	 { "wxPyApp_GetVendorName", _wrap_wxPyApp_GetVendorName, METH_VARARGS },
-	 { "wxPyApp_GetTopWindow", _wrap_wxPyApp_GetTopWindow, METH_VARARGS },
-	 { "wxPyApp_GetPrintMode", _wrap_wxPyApp_GetPrintMode, METH_VARARGS },
-	 { "wxPyApp_GetExitOnFrameDelete", _wrap_wxPyApp_GetExitOnFrameDelete, METH_VARARGS },
-	 { "wxPyApp_GetClassName", _wrap_wxPyApp_GetClassName, METH_VARARGS },
-	 { "wxPyApp_GetAuto3D", _wrap_wxPyApp_GetAuto3D, METH_VARARGS },
-	 { "wxPyApp_GetAppName", _wrap_wxPyApp_GetAppName, METH_VARARGS },
-	 { "delete_wxPyApp", _wrap_delete_wxPyApp, METH_VARARGS },
-	 { "new_wxPyApp", _wrap_new_wxPyApp, METH_VARARGS },
-	 { "_wxSetDictionary", __wxSetDictionary, METH_VARARGS },
-	 { "_wxStart", __wxStart, METH_VARARGS },
-	 { "ptrmap", _wrap_ptrmap, METH_VARARGS },
-	 { "ptradd", _wrap_ptradd, METH_VARARGS },
-	 { "ptrfree", _wrap_ptrfree, METH_VARARGS },
-	 { "ptrcreate", _wrap_ptrcreate, METH_VARARGS },
-	 { "ptrset", _wrap_ptrset, METH_VARARGS },
-	 { "ptrvalue", _wrap_ptrvalue, METH_VARARGS },
-	 { "ptrcast", _wrap_ptrcast, METH_VARARGS },
+	 { "delete___wxPyCleanup", (PyCFunction) _wrap_delete___wxPyCleanup, METH_VARARGS | METH_KEYWORDS },
+	 { "new___wxPyCleanup", (PyCFunction) _wrap_new___wxPyCleanup, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetStdIcon", (PyCFunction) _wrap_wxPyApp_GetStdIcon, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_SetVendorName", (PyCFunction) _wrap_wxPyApp_SetVendorName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_SetTopWindow", (PyCFunction) _wrap_wxPyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_SetPrintMode", (PyCFunction) _wrap_wxPyApp_SetPrintMode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_SetExitOnFrameDelete", (PyCFunction) _wrap_wxPyApp_SetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_SetClassName", (PyCFunction) _wrap_wxPyApp_SetClassName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_SetAuto3D", (PyCFunction) _wrap_wxPyApp_SetAuto3D, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_SetAppName", (PyCFunction) _wrap_wxPyApp_SetAppName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_ProcessIdle", (PyCFunction) _wrap_wxPyApp_ProcessIdle, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_Pending", (PyCFunction) _wrap_wxPyApp_Pending, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_MainLoop", (PyCFunction) _wrap_wxPyApp_MainLoop, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_Initialized", (PyCFunction) _wrap_wxPyApp_Initialized, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_ExitMainLoop", (PyCFunction) _wrap_wxPyApp_ExitMainLoop, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_Dispatch", (PyCFunction) _wrap_wxPyApp_Dispatch, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetVendorName", (PyCFunction) _wrap_wxPyApp_GetVendorName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetTopWindow", (PyCFunction) _wrap_wxPyApp_GetTopWindow, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetPrintMode", (PyCFunction) _wrap_wxPyApp_GetPrintMode, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetExitOnFrameDelete", (PyCFunction) _wrap_wxPyApp_GetExitOnFrameDelete, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetClassName", (PyCFunction) _wrap_wxPyApp_GetClassName, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetAuto3D", (PyCFunction) _wrap_wxPyApp_GetAuto3D, METH_VARARGS | METH_KEYWORDS },
+	 { "wxPyApp_GetAppName", (PyCFunction) _wrap_wxPyApp_GetAppName, METH_VARARGS | METH_KEYWORDS },
+	 { "delete_wxPyApp", (PyCFunction) _wrap_delete_wxPyApp, METH_VARARGS | METH_KEYWORDS },
+	 { "new_wxPyApp", (PyCFunction) _wrap_new_wxPyApp, METH_VARARGS | METH_KEYWORDS },
+	 { "_wxSetDictionary", (PyCFunction) __wxSetDictionary, METH_VARARGS | METH_KEYWORDS },
+	 { "_wxStart", (PyCFunction) __wxStart, METH_VARARGS | METH_KEYWORDS },
+	 { "ptrmap", (PyCFunction) _wrap_ptrmap, METH_VARARGS | METH_KEYWORDS },
+	 { "ptradd", (PyCFunction) _wrap_ptradd, METH_VARARGS | METH_KEYWORDS },
+	 { "ptrfree", (PyCFunction) _wrap_ptrfree, METH_VARARGS | METH_KEYWORDS },
+	 { "ptrcreate", (PyCFunction) _wrap_ptrcreate, METH_VARARGS | METH_KEYWORDS },
+	 { "ptrset", (PyCFunction) _wrap_ptrset, METH_VARARGS | METH_KEYWORDS },
+	 { "ptrvalue", (PyCFunction) _wrap_ptrvalue, METH_VARARGS | METH_KEYWORDS },
+	 { "ptrcast", (PyCFunction) _wrap_ptrcast, METH_VARARGS | METH_KEYWORDS },
 	 { NULL, NULL }
 };
 #ifdef __cplusplus
diff --git a/utils/wxPython/src/printfw.i b/utils/wxPython/src/printfw.i
index d4da779032..20148f2287 100644
--- a/utils/wxPython/src/printfw.i
+++ b/utils/wxPython/src/printfw.i
@@ -269,9 +269,7 @@ public:
     %pragma(python) addtomethod = "__init__:self._setSelf(self)"
 
     %addmethods {
-        void Destroy() {
-            delete self;
-        }
+        void Destroy() { delete self; }
     }
 
     wxDC* GetDC();
diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i
index 1bb931f518..1796c2a534 100644
--- a/utils/wxPython/src/windows.i
+++ b/utils/wxPython/src/windows.i
@@ -29,8 +29,7 @@
 %import gdi.i
 
 %pragma(python) code = "import wx"
-//%pragma(python) code = "import controls"
-//%pragma(python) code = "wxButtonPtr = controls.wxWindowPtr"
+
 
 //---------------------------------------------------------------------------
 
@@ -51,6 +50,7 @@ public:
 
 //----------------------------------------------------------------------
 
+%apply int * INOUT { int* x, int* y };
 
 class wxWindow : public wxEvtHandler {
 public:
@@ -68,8 +68,11 @@ public:
     void Centre(int direction = wxBOTH);
     void CentreOnParent(int direction = wxBOTH );
     void CenterOnParent(int direction = wxBOTH );
-    %name(ClientToScreenXY)void ClientToScreen(int *BOTH, int *BOTH);
+
+    // (uses apply'ed INOUT typemap, see above)
+    %name(ClientToScreenXY)void ClientToScreen(int* x, int* y);
     wxPoint ClientToScreen(const wxPoint& pt);
+
     bool Close(int force = FALSE);
     bool Destroy();
     void DestroyChildren();
@@ -136,7 +139,8 @@ public:
     void ReleaseMouse();
     bool Reparent( wxWindow* newParent );
 
-    %name(ScreenToClientXY)void ScreenToClient(int *BOTH, int *BOTH);
+    // (uses apply'ed INOUT typemap, see above)
+    %name(ScreenToClientXY)void ScreenToClient(int *x, int *y);
     wxPoint ScreenToClient(const wxPoint& pt);
 
     void ScrollWindow(int dx, int dy, const wxRect* rect = NULL);
@@ -190,6 +194,10 @@ public:
     wxToolTip* GetToolTip();
 };
 
+//%clear int* x, int* y;
+
+
+
 %pragma(python) code = "
 def wxDLG_PNT(win, point_or_x, y=None):
     if y is None:
@@ -223,6 +231,7 @@ wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
 #endif
 
 
+
 //---------------------------------------------------------------------------
 
 class wxPanel : public wxWindow {
@@ -336,6 +345,13 @@ public:
     bool IsEnabled(int id);
     void SetLabel(int id, const wxString& label);
     void UpdateUI(wxEvtHandler* source = NULL);
+
+    %addmethods {
+        void Destroy() {
+            delete self;
+        }
+    }
+
 };
 
 
@@ -419,165 +435,5 @@ public:
 };
 
 //---------------------------------------------------------------------------
-/////////////////////////////////////////////////////////////////////////////
-//
-// $Log$
-// Revision 1.18  1999/07/31 07:54:35  RD
-// wxPython 2.1b1:
-//
-// 	Added the missing wxWindow.GetUpdateRegion() method.
-//
-// 	Made a new change in SWIG (update your patches everybody) that
-// 	provides a fix for global shadow objects that get an exception in
-// 	their __del__ when their extension module has already been deleted.
-// 	It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
-// 	line 496 if you want to do it by hand.
-//
-// 	It is now possible to run through MainLoop more than once in any one
-// 	process.  The cleanup that used to happen as MainLoop completed (and
-// 	prevented it from running again) has been delayed until the wxc module
-// 	is being unloaded by Python.
-//
-// 	wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
-// 	wxWindow.PopupMenuXY to be consistent with some other methods.
-//
-// 	Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
-//
-// 	You can now provide your own app.MainLoop method.  See
-// 	wxPython/demo/demoMainLoop.py for an example and some explaination.
-//
-// 	Got the in-place-edit for the wxTreeCtrl fixed and added some demo
-// 	code to show how to use it.
-//
-// 	Put the wxIcon constructor back in for GTK as it now has one that
-// 	matches MSW's.
-//
-// 	Added wxGrid.GetCells
-//
-// 	Added wxSystemSettings static methods as functions with names like
-// 	wxSystemSettings_GetSystemColour.
-//
-// 	Removed wxPyMenu since using menu callbacks have been depreciated in
-// 	wxWindows.  Use wxMenu and events instead.
-//
-// 	Added alternate wxBitmap constructor (for MSW only) as
-// 	      wxBitmapFromData(data, type, width, height, depth = 1)
-//
-// 	Added a helper function named wxPyTypeCast that can convert shadow
-// 	objects of one type into shadow objects of another type.  (Like doing
-// 	a down-cast.)  See the implementation in wx.py for some docs.
-//
-// Revision 1.17  1999/06/22 07:03:03  RD
-//
-// wxPython 2.1b1 for wxMSW  (wxGTK coming soon)
-// Lots of changes, see the README.txt for details...
-//
-// Revision 1.16  1999/05/15 00:56:04  RD
-//
-// fixes for GetReturnCode/SetReturnCode
-//
-// Revision 1.15  1999/04/30 03:29:19  RD
-//
-// wxPython 2.0b9, first phase (win32)
-// Added gobs of stuff, see wxPython/README.txt for details
-//
-// Revision 1.14.4.3  1999/03/27 23:29:15  RD
-//
-// wxPython 2.0b8
-//     Python thread support
-//     various minor additions
-//     various minor fixes
-//
-// Revision 1.14.4.2  1999/03/16 06:26:29  RD
-//
-// wxPython 2.0b7
-//
-// Revision 1.14.4.1  1999/03/16 06:04:04  RD
-//
-// wxPython 2.0b7
-//
-// Revision 1.14  1999/02/23 23:48:33  RD
-//
-// reenabled some methods for wxPython on wxGTK
-//
-// Revision 1.13  1999/02/20 10:02:38  RD
-//
-// Changes needed to enable wxGTK compatibility.
-//
-// Revision 1.12  1999/02/20 09:03:03  RD
-// Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a
-// window handle.  If you can get the window handle into the python code,
-// it should just work...  More news on this later.
-//
-// Added wxImageList, wxToolTip.
-//
-// Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the
-// wxRegConfig class.
-//
-// As usual, some bug fixes, tweaks, etc.
-//
-// Revision 1.11  1998/12/18 15:49:10  RR
-//
-//   wxClipboard now serves the primary selection as well
-//   wxPython fixes
-//   warning mesages
-//
-// Revision 1.10  1998/12/17 17:52:20  RD
-//
-// wxPython 0.5.2
-// Minor fixes and SWIG code generation for RR's changes.  MSW and GTK
-// versions are much closer now!
-//
-// Revision 1.9  1998/12/17 14:07:46  RR
-//
-//   Removed minor differences between wxMSW and wxGTK
-//
-// Revision 1.8  1998/12/16 22:10:56  RD
-//
-// Tweaks needed to be able to build wxPython with wxGTK.
-//
-// Revision 1.7  1998/12/15 20:41:25  RD
-// Changed the import semantics from "from wxPython import *" to "from
-// wxPython.wx import *"  This is for people who are worried about
-// namespace pollution, they can use "from wxPython import wx" and then
-// prefix all the wxPython identifiers with "wx."
-//
-// Added wxTaskbarIcon for wxMSW.
-//
-// Made the events work for wxGrid.
-//
-// Added wxConfig.
-//
-// Added wxMiniFrame for wxGTK, (untested.)
-//
-// Changed many of the args and return values that were pointers to gdi
-// objects to references to reflect changes in the wxWindows API.
-//
-// Other assorted fixes and additions.
-//
-// Revision 1.6  1998/10/02 06:40:43  RD
-//
-// Version 0.4 of wxPython for MSW.
-//
-// Revision 1.5  1998/08/17 18:29:40  RD
-// Removed an extra method definition
-//
-// Revision 1.4  1998/08/16 04:31:11  RD
-// More wxGTK work.
-//
-// Revision 1.3  1998/08/15 07:36:47  RD
-// - Moved the header in the .i files out of the code that gets put into
-// the .cpp files.  It caused CVS conflicts because of the RCS ID being
-// different each time.
-//
-// - A few minor fixes.
-//
-// Revision 1.2  1998/08/14 23:36:46  RD
-// Beginings of wxGTK compatibility
-//
-// Revision 1.1  1998/08/09 08:25:52  RD
-// Initial version
-//
-//
 
 
-- 
2.45.2