reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-09-08 03:31:18 +00:00
parent 8e1a5d3aa9
commit ac5d357a44
12 changed files with 1457 additions and 395 deletions
--- a/wxPython/contrib/glcanvas/mac/glcanvas.py
+++ b/wxPython/contrib/glcanvas/mac/glcanvas.py
@@ -70,22 +70,6 @@ class GLContext(_core.Object):
        _glcanvas.GLContext_swiginit(self,_glcanvas.new_GLContext(*args, **kwargs))
    __swig_destroy__ = _glcanvas.delete_GLContext
    __del__ = lambda self : None;
-    def SetCurrent(*args, **kwargs):
-        """SetCurrent(self)"""
-        return _glcanvas.GLContext_SetCurrent(*args, **kwargs)
-
-    def SetColour(*args, **kwargs):
-        """SetColour(self, String colour)"""
-        return _glcanvas.GLContext_SetColour(*args, **kwargs)
-
-    def SwapBuffers(*args, **kwargs):
-        """SwapBuffers(self)"""
-        return _glcanvas.GLContext_SwapBuffers(*args, **kwargs)
-
-    def GetWindow(*args, **kwargs):
-        """GetWindow(self) -> Window"""
-        return _glcanvas.GLContext_GetWindow(*args, **kwargs)
-
 _glcanvas.GLContext_swigregister(GLContext)
 cvar = _glcanvas.cvar
 GLCanvasNameStr = cvar.GLCanvasNameStr
--- a/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
+++ b/wxPython/contrib/glcanvas/mac/glcanvas_wrap.cpp
@@ -2848,135 +2848,6 @@ fail:
 }


-SWIGINTERN PyObject *_wrap_GLContext_SetCurrent(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGLContext *arg1 = (wxGLContext *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGLContext, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GLContext_SetCurrent" "', expected argument " "1"" of type '" "wxGLContext *""'"); 
-  }
-  arg1 = reinterpret_cast< wxGLContext * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetCurrent();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_GLContext_SetColour(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxGLContext *arg1 = (wxGLContext *) 0 ;
-  wxString *arg2 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  bool temp2 = false ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "colour", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:GLContext_SetColour",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxGLContext, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GLContext_SetColour" "', expected argument " "1"" of type '" "wxGLContext *""'"); 
-  }
-  arg1 = reinterpret_cast< wxGLContext * >(argp1);
-  {
-    arg2 = wxString_in_helper(obj1);
-    if (arg2 == NULL) SWIG_fail;
-    temp2 = true;
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetColour((wxString const &)*arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  {
-    if (temp2)
-    delete arg2;
-  }
-  return resultobj;
-fail:
-  {
-    if (temp2)
-    delete arg2;
-  }
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_GLContext_SwapBuffers(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGLContext *arg1 = (wxGLContext *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGLContext, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GLContext_SwapBuffers" "', expected argument " "1"" of type '" "wxGLContext *""'"); 
-  }
-  arg1 = reinterpret_cast< wxGLContext * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SwapBuffers();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_GLContext_GetWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxGLContext *arg1 = (wxGLContext *) 0 ;
-  wxWindow *result = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxGLContext, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "GLContext_GetWindow" "', expected argument " "1"" of type '" "wxGLContext *""'"); 
-  }
-  arg1 = reinterpret_cast< wxGLContext * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxWindow *)(arg1)->GetWindow();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = wxPyMake_wxObject(result, 0); 
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *GLContext_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *obj;
  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -3400,10 +3271,6 @@ SWIGINTERN PyObject *GLCanvas_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject
 static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_GLContext", (PyCFunction) _wrap_new_GLContext, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"delete_GLContext", (PyCFunction)_wrap_delete_GLContext, METH_O, NULL},
-	 { (char *)"GLContext_SetCurrent", (PyCFunction)_wrap_GLContext_SetCurrent, METH_O, NULL},
-	 { (char *)"GLContext_SetColour", (PyCFunction) _wrap_GLContext_SetColour, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"GLContext_SwapBuffers", (PyCFunction)_wrap_GLContext_SwapBuffers, METH_O, NULL},
-	 { (char *)"GLContext_GetWindow", (PyCFunction)_wrap_GLContext_GetWindow, METH_O, NULL},
 	 { (char *)"GLContext_swigregister", GLContext_swigregister, METH_VARARGS, NULL},
 	 { (char *)"GLContext_swiginit", GLContext_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_GLCanvas", (PyCFunction) _wrap_new_GLCanvas, METH_VARARGS | METH_KEYWORDS, NULL},
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -942,6 +942,10 @@ class Gauge(_core.Control):
        return _controls_.Gauge_GetClassDefaultAttributes(*args, **kwargs)

    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    BezelFace = property(GetBezelFace,SetBezelFace,doc="See `GetBezelFace` and `SetBezelFace`") 
+    Range = property(GetRange,SetRange,doc="See `GetRange` and `SetRange`") 
+    ShadowWidth = property(GetShadowWidth,SetShadowWidth,doc="See `GetShadowWidth` and `SetShadowWidth`") 
+    Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") 
 _controls_.Gauge_swigregister(Gauge)
 GaugeNameStr = cvar.GaugeNameStr

@@ -1399,6 +1403,7 @@ class ListBox(_core.ControlWithItems):
        return _controls_.ListBox_GetClassDefaultAttributes(*args, **kwargs)

    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    Selections = property(GetSelections,doc="See `GetSelections`") 
 _controls_.ListBox_swigregister(ListBox)
 ListBoxNameStr = cvar.ListBoxNameStr

@@ -3158,6 +3163,7 @@ class Listbook(BookCtrlBase):
        """GetListView(self) -> ListView"""
        return _controls_.Listbook_GetListView(*args, **kwargs)

+    ListView = property(GetListView,doc="See `GetListView`") 
 _controls_.Listbook_swigregister(Listbook)

 def PreListbook(*args, **kwargs):
@@ -4032,6 +4038,9 @@ class ListItemAttr(object):
        args[0].thisown = 0
        return val

+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") 
 _controls_.ListItemAttr_swigregister(ListItemAttr)
 ListCtrlNameStr = cvar.ListCtrlNameStr

@@ -4172,6 +4181,19 @@ class ListItem(_core.Object):
    m_data = property(_controls_.ListItem_m_data_get, _controls_.ListItem_m_data_set)
    m_format = property(_controls_.ListItem_m_format_get, _controls_.ListItem_m_format_set)
    m_width = property(_controls_.ListItem_m_width_get, _controls_.ListItem_m_width_set)
+    Align = property(GetAlign,SetAlign,doc="See `GetAlign` and `SetAlign`") 
+    Attributes = property(GetAttributes,doc="See `GetAttributes`") 
+    BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
+    Column = property(GetColumn,SetColumn,doc="See `GetColumn` and `SetColumn`") 
+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Image = property(GetImage,SetImage,doc="See `GetImage` and `SetImage`") 
+    Mask = property(GetMask,SetMask,doc="See `GetMask` and `SetMask`") 
+    State = property(GetState,SetState,doc="See `GetState` and `SetState`") 
+    Text = property(GetText,SetText,doc="See `GetText` and `SetText`") 
+    TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") 
+    Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") 
 _controls_.ListItem_swigregister(ListItem)

 #---------------------------------------------------------------------------
@@ -4247,6 +4269,18 @@ class ListEvent(_core.NotifyEvent):
        """SetEditCanceled(self, bool editCancelled)"""
        return _controls_.ListEvent_SetEditCanceled(*args, **kwargs)

+    CacheFrom = property(GetCacheFrom,doc="See `GetCacheFrom`") 
+    CacheTo = property(GetCacheTo,doc="See `GetCacheTo`") 
+    Column = property(GetColumn,doc="See `GetColumn`") 
+    Data = property(GetData,doc="See `GetData`") 
+    Image = property(GetImage,doc="See `GetImage`") 
+    Index = property(GetIndex,doc="See `GetIndex`") 
+    Item = property(GetItem,doc="See `GetItem`") 
+    KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") 
+    Label = property(GetLabel,doc="See `GetLabel`") 
+    Mask = property(GetMask,doc="See `GetMask`") 
+    Point = property(GetPoint,doc="See `GetPoint`") 
+    Text = property(GetText,doc="See `GetText`") 
 _controls_.ListEvent_swigregister(ListEvent)

 wxEVT_COMMAND_LIST_BEGIN_DRAG = _controls_.wxEVT_COMMAND_LIST_BEGIN_DRAG
@@ -4693,6 +4727,17 @@ class ListCtrl(_core.Control):
        return _controls_.ListCtrl_GetClassDefaultAttributes(*args, **kwargs)

    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    ColumnCount = property(GetColumnCount,doc="See `GetColumnCount`") 
+    CountPerPage = property(GetCountPerPage,doc="See `GetCountPerPage`") 
+    EditControl = property(GetEditControl,doc="See `GetEditControl`") 
+    FocusedItem = property(GetFocusedItem,doc="See `GetFocusedItem`") 
+    ImageList = property(GetImageList,SetImageList,doc="See `GetImageList` and `SetImageList`") 
+    ItemCount = property(GetItemCount,SetItemCount,doc="See `GetItemCount` and `SetItemCount`") 
+    MainWindow = property(GetMainWindow,doc="See `GetMainWindow`") 
+    SelectedItemCount = property(GetSelectedItemCount,doc="See `GetSelectedItemCount`") 
+    TextColour = property(GetTextColour,SetTextColour,doc="See `GetTextColour` and `SetTextColour`") 
+    TopItem = property(GetTopItem,doc="See `GetTopItem`") 
+    ViewRect = property(GetViewRect,doc="See `GetViewRect`") 
 _controls_.ListCtrl_swigregister(ListCtrl)

 def PreListCtrl(*args, **kwargs):
@@ -4774,6 +4819,7 @@ class ListView(ListCtrl):
        """ClearColumnImage(self, int col)"""
        return _controls_.ListView_ClearColumnImage(*args, **kwargs)

+    FocusedItem = property(GetFocusedItem,doc="See `GetFocusedItem`") 
 _controls_.ListView_swigregister(ListView)

 def PreListView(*args, **kwargs):
@@ -5505,6 +5551,15 @@ class GenericDirCtrl(_core.Control):
        """ReCreateTree(self)"""
        return _controls_.GenericDirCtrl_ReCreateTree(*args, **kwargs)

+    DefaultPath = property(GetDefaultPath,SetDefaultPath,doc="See `GetDefaultPath` and `SetDefaultPath`") 
+    FilePath = property(GetFilePath,doc="See `GetFilePath`") 
+    Filter = property(GetFilter,SetFilter,doc="See `GetFilter` and `SetFilter`") 
+    FilterIndex = property(GetFilterIndex,SetFilterIndex,doc="See `GetFilterIndex` and `SetFilterIndex`") 
+    FilterListCtrl = property(GetFilterListCtrl,doc="See `GetFilterListCtrl`") 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+    RootId = property(GetRootId,doc="See `GetRootId`") 
+    ShowHidden = property(GetShowHidden,ShowHidden,doc="See `GetShowHidden` and `ShowHidden`") 
+    TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") 
 _controls_.GenericDirCtrl_swigregister(GenericDirCtrl)
 DirDialogDefaultFolderStr = cvar.DirDialogDefaultFolderStr

@@ -5826,6 +5881,10 @@ class HelpEvent(_core.CommandEvent):
        """SetOrigin(self, int origin)"""
        return _controls_.HelpEvent_SetOrigin(*args, **kwargs)

+    Link = property(GetLink,SetLink,doc="See `GetLink` and `SetLink`") 
+    Origin = property(GetOrigin,SetOrigin,doc="See `GetOrigin` and `SetOrigin`") 
+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
+    Target = property(GetTarget,SetTarget,doc="See `GetTarget` and `SetTarget`") 
 _controls_.HelpEvent_swigregister(HelpEvent)

 class ContextHelp(_core.Object):
@@ -6337,6 +6396,11 @@ class HyperlinkCtrl(_core.Control):
        """GetVisited(self) -> bool"""
        return _controls_.HyperlinkCtrl_GetVisited(*args, **kwargs)

+    HoverColour = property(GetHoverColour,SetHoverColour,doc="See `GetHoverColour` and `SetHoverColour`") 
+    NormalColour = property(GetNormalColour,SetNormalColour,doc="See `GetNormalColour` and `SetNormalColour`") 
+    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
+    Visited = property(GetVisited,SetVisited,doc="See `GetVisited` and `SetVisited`") 
+    VisitedColour = property(GetVisitedColour,SetVisitedColour,doc="See `GetVisitedColour` and `SetVisitedColour`") 
 _controls_.HyperlinkCtrl_swigregister(HyperlinkCtrl)
 HyperlinkCtrlNameStr = cvar.HyperlinkCtrlNameStr

@@ -6373,6 +6437,7 @@ class HyperlinkEvent(_core.CommandEvent):
        """SetURL(self, String url)"""
        return _controls_.HyperlinkEvent_SetURL(*args, **kwargs)

+    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 
 _controls_.HyperlinkEvent_swigregister(HyperlinkEvent)

 EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 )
@@ -6647,6 +6712,8 @@ class FilePickerCtrl(PickerBase):
        """GetTextCtrlValue(self) -> String"""
        return _controls_.FilePickerCtrl_GetTextCtrlValue(*args, **kwargs)

+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+    TextCtrlValue = property(GetTextCtrlValue,doc="See `GetTextCtrlValue`") 
 _controls_.FilePickerCtrl_swigregister(FilePickerCtrl)
 FilePickerCtrlNameStr = cvar.FilePickerCtrlNameStr
 FileSelectorPromptStr = cvar.FileSelectorPromptStr
@@ -6729,6 +6796,7 @@ class FileDirPickerEvent(_core.CommandEvent):
        """SetPath(self, String p)"""
        return _controls_.FileDirPickerEvent_SetPath(*args, **kwargs)

+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
 _controls_.FileDirPickerEvent_swigregister(FileDirPickerEvent)

 #---------------------------------------------------------------------------
@@ -6776,6 +6844,8 @@ class FontPickerCtrl(PickerBase):
        """GetMaxPointSize(self) -> unsigned int"""
        return _controls_.FontPickerCtrl_GetMaxPointSize(*args, **kwargs)

+    MaxPointSize = property(GetMaxPointSize,SetMaxPointSize,doc="See `GetMaxPointSize` and `SetMaxPointSize`") 
+    SelectedFont = property(GetSelectedFont,SetSelectedFont,doc="See `GetSelectedFont` and `SetSelectedFont`") 
 _controls_.FontPickerCtrl_swigregister(FontPickerCtrl)
 FontPickerCtrlNameStr = cvar.FontPickerCtrlNameStr

@@ -6802,6 +6872,7 @@ class FontPickerEvent(_core.CommandEvent):
        """SetFont(self, Font c)"""
        return _controls_.FontPickerEvent_SetFont(*args, **kwargs)

+    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
 _controls_.FontPickerEvent_swigregister(FontPickerEvent)


--- a/wxPython/src/mac/_core.py
+++ b/wxPython/src/mac/_core.py
@@ -205,6 +205,7 @@ ID_HELP_INDEX = _core_.ID_HELP_INDEX
 ID_HELP_SEARCH = _core_.ID_HELP_SEARCH
 ID_CLOSE_ALL = _core_.ID_CLOSE_ALL
 ID_PREFERENCES = _core_.ID_PREFERENCES
+ID_EDIT = _core_.ID_EDIT
 ID_CUT = _core_.ID_CUT
 ID_COPY = _core_.ID_COPY
 ID_PASTE = _core_.ID_PASTE
@@ -224,6 +225,7 @@ ID_VIEW_SORTDATE = _core_.ID_VIEW_SORTDATE
 ID_VIEW_SORTNAME = _core_.ID_VIEW_SORTNAME
 ID_VIEW_SORTSIZE = _core_.ID_VIEW_SORTSIZE
 ID_VIEW_SORTTYPE = _core_.ID_VIEW_SORTTYPE
+ID_FILE = _core_.ID_FILE
 ID_FILE1 = _core_.ID_FILE1
 ID_FILE2 = _core_.ID_FILE2
 ID_FILE3 = _core_.ID_FILE3
@@ -1713,6 +1715,10 @@ class FSFile(Object):
        """GetStream(self) -> InputStream"""
        return _core_.FSFile_GetStream(*args, **kwargs)

+    def DetachStream(*args, **kwargs):
+        """DetachStream(self)"""
+        return _core_.FSFile_DetachStream(*args, **kwargs)
+
    def GetMimeType(*args, **kwargs):
        """GetMimeType(self) -> String"""
        return _core_.FSFile_GetMimeType(*args, **kwargs)
@@ -1729,6 +1735,11 @@ class FSFile(Object):
        """GetModificationTime(self) -> DateTime"""
        return _core_.FSFile_GetModificationTime(*args, **kwargs)

+    Anchor = property(GetAnchor,doc="See `GetAnchor`") 
+    Location = property(GetLocation,doc="See `GetLocation`") 
+    MimeType = property(GetMimeType,doc="See `GetMimeType`") 
+    ModificationTime = property(GetModificationTime,doc="See `GetModificationTime`") 
+    Stream = property(GetStream,doc="See `GetStream`") 
 _core_.FSFile_swigregister(FSFile)

 class CPPFileSystemHandler(object):
@@ -1789,6 +1800,11 @@ class FileSystemHandler(CPPFileSystemHandler):
        """GetMimeTypeFromExt(self, String location) -> String"""
        return _core_.FileSystemHandler_GetMimeTypeFromExt(*args, **kwargs)

+    Anchor = property(GetAnchor,doc="See `GetAnchor`") 
+    LeftLocation = property(GetLeftLocation,doc="See `GetLeftLocation`") 
+    MimeTypeFromExt = property(GetMimeTypeFromExt,doc="See `GetMimeTypeFromExt`") 
+    Protocol = property(GetProtocol,doc="See `GetProtocol`") 
+    RightLocation = property(GetRightLocation,doc="See `GetRightLocation`") 
 _core_.FileSystemHandler_swigregister(FileSystemHandler)

 class FileSystem(Object):
@@ -1825,6 +1841,11 @@ class FileSystem(Object):
        return _core_.FileSystem_AddHandler(*args, **kwargs)

    AddHandler = staticmethod(AddHandler)
+    def RemoveHandler(*args, **kwargs):
+        """RemoveHandler(CPPFileSystemHandler handler) -> CPPFileSystemHandler"""
+        return _core_.FileSystem_RemoveHandler(*args, **kwargs)
+
+    RemoveHandler = staticmethod(RemoveHandler)
    def CleanUpHandlers(*args, **kwargs):
        """CleanUpHandlers()"""
        return _core_.FileSystem_CleanUpHandlers(*args, **kwargs)
@@ -1840,12 +1861,17 @@ class FileSystem(Object):
        return _core_.FileSystem_URLToFileName(*args, **kwargs)

    URLToFileName = staticmethod(URLToFileName)
+    Path = property(GetPath,doc="See `GetPath`") 
 _core_.FileSystem_swigregister(FileSystem)

 def FileSystem_AddHandler(*args, **kwargs):
  """FileSystem_AddHandler(CPPFileSystemHandler handler)"""
  return _core_.FileSystem_AddHandler(*args, **kwargs)

+def FileSystem_RemoveHandler(*args, **kwargs):
+  """FileSystem_RemoveHandler(CPPFileSystemHandler handler) -> CPPFileSystemHandler"""
+  return _core_.FileSystem_RemoveHandler(*args, **kwargs)
+
 def FileSystem_CleanUpHandlers(*args):
  """FileSystem_CleanUpHandlers()"""
  return _core_.FileSystem_CleanUpHandlers(*args)
@@ -2018,6 +2044,10 @@ class ImageHandler(Object):
        """SetMimeType(self, String mimetype)"""
        return _core_.ImageHandler_SetMimeType(*args, **kwargs)

+    Extension = property(GetExtension,SetExtension,doc="See `GetExtension` and `SetExtension`") 
+    MimeType = property(GetMimeType,SetMimeType,doc="See `GetMimeType` and `SetMimeType`") 
+    Name = property(GetName,SetName,doc="See `GetName` and `SetName`") 
+    Type = property(GetType,SetType,doc="See `GetType` and `SetType`") 
 _core_.ImageHandler_swigregister(ImageHandler)

 class PyImageHandler(ImageHandler):
@@ -2915,6 +2945,16 @@ class Image(Object):

    HSVtoRGB = staticmethod(HSVtoRGB)
    def __nonzero__(self): return self.Ok() 
+    AlphaBuffer = property(GetAlphaBuffer,SetAlphaBuffer,doc="See `GetAlphaBuffer` and `SetAlphaBuffer`") 
+    AlphaData = property(GetAlphaData,SetAlphaData,doc="See `GetAlphaData` and `SetAlphaData`") 
+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
+    DataBuffer = property(GetDataBuffer,SetDataBuffer,doc="See `GetDataBuffer` and `SetDataBuffer`") 
+    Height = property(GetHeight,doc="See `GetHeight`") 
+    MaskBlue = property(GetMaskBlue,doc="See `GetMaskBlue`") 
+    MaskGreen = property(GetMaskGreen,doc="See `GetMaskGreen`") 
+    MaskRed = property(GetMaskRed,doc="See `GetMaskRed`") 
+    Size = property(GetSize,doc="See `GetSize`") 
+    Width = property(GetWidth,doc="See `GetWidth`") 
 _core_.Image_swigregister(Image)

 def ImageFromMime(*args, **kwargs):
@@ -3401,6 +3441,9 @@ class EvtHandler(Object):
            id  = source.GetId()
        return event.Unbind(self, id, id2)              

+    EvtHandlerEnabled = property(GetEvtHandlerEnabled,SetEvtHandlerEnabled,doc="See `GetEvtHandlerEnabled` and `SetEvtHandlerEnabled`") 
+    NextHandler = property(GetNextHandler,SetNextHandler,doc="See `GetNextHandler` and `SetNextHandler`") 
+    PreviousHandler = property(GetPreviousHandler,SetPreviousHandler,doc="See `GetPreviousHandler` and `SetPreviousHandler`") 
 _core_.EvtHandler_swigregister(EvtHandler)

 #---------------------------------------------------------------------------
@@ -3922,6 +3965,11 @@ class Event(Object):
        """Clone(self) -> Event"""
        return _core_.Event_Clone(*args, **kwargs)

+    EventObject = property(GetEventObject,SetEventObject,doc="See `GetEventObject` and `SetEventObject`") 
+    EventType = property(GetEventType,SetEventType,doc="See `GetEventType` and `SetEventType`") 
+    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
+    Skipped = property(GetSkipped,doc="See `GetSkipped`") 
+    Timestamp = property(GetTimestamp,SetTimestamp,doc="See `GetTimestamp` and `SetTimestamp`") 
 _core_.Event_swigregister(Event)

 #---------------------------------------------------------------------------
@@ -4879,7 +4927,6 @@ class KeyEvent(Event):
        """
        return _core_.KeyEvent_GetKeyCode(*args, **kwargs)

-    KeyCode = GetKeyCode 
    def GetUnicodeKey(*args, **kwargs):
        """
        GetUnicodeKey(self) -> int
@@ -4964,6 +5011,14 @@ class KeyEvent(Event):
    m_scanCode = property(_core_.KeyEvent_m_scanCode_get, _core_.KeyEvent_m_scanCode_set)
    m_rawCode = property(_core_.KeyEvent_m_rawCode_get, _core_.KeyEvent_m_rawCode_set)
    m_rawFlags = property(_core_.KeyEvent_m_rawFlags_get, _core_.KeyEvent_m_rawFlags_set)
+    KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") 
+    Modifiers = property(GetModifiers,doc="See `GetModifiers`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    RawKeyCode = property(GetRawKeyCode,doc="See `GetRawKeyCode`") 
+    RawKeyFlags = property(GetRawKeyFlags,doc="See `GetRawKeyFlags`") 
+    UnicodeKey = property(GetUnicodeKey,SetUnicodeKey,doc="See `GetUnicodeKey` and `SetUnicodeKey`") 
+    X = property(GetX,doc="See `GetX`") 
+    Y = property(GetY,doc="See `GetY`") 
 _core_.KeyEvent_swigregister(KeyEvent)

 #---------------------------------------------------------------------------
@@ -5128,6 +5183,7 @@ class EraseEvent(Event):
        """
        return _core_.EraseEvent_GetDC(*args, **kwargs)

+    DC = property(GetDC,doc="See `GetDC`") 
 _core_.EraseEvent_swigregister(EraseEvent)

 #---------------------------------------------------------------------------
@@ -5168,6 +5224,7 @@ class FocusEvent(Event):
        """SetWindow(self, Window win)"""
        return _core_.FocusEvent_SetWindow(*args, **kwargs)

+    Window = property(GetWindow,SetWindow,doc="See `GetWindow` and `SetWindow`") 
 _core_.FocusEvent_swigregister(FocusEvent)

 #---------------------------------------------------------------------------
@@ -5397,7 +5454,6 @@ class CloseEvent(Event):
        return _core_.CloseEvent_CanVeto(*args, **kwargs)

    LoggingOff = property(GetLoggingOff,SetLoggingOff,doc="See `GetLoggingOff` and `SetLoggingOff`") 
-    Veto = property(GetVeto,doc="See `GetVeto`") 
 _core_.CloseEvent_swigregister(CloseEvent)

 #---------------------------------------------------------------------------
@@ -6683,6 +6739,14 @@ class PyApp(EvtHandler):
        """
        return _core_.PyApp_Exit(*args, **kwargs)

+    def GetLayoutDirection(*args, **kwargs):
+        """
+        GetLayoutDirection(self) -> wxLayoutDirection
+
+        Return the layout direction for the current locale.
+        """
+        return _core_.PyApp_GetLayoutDirection(*args, **kwargs)
+
    def ExitMainLoop(*args, **kwargs):
        """
        ExitMainLoop(self)
@@ -7501,6 +7565,16 @@ class AcceleratorEntry(object):
        """
        return _core_.AcceleratorEntry_Set(*args, **kwargs)

+    def Create(*args, **kwargs):
+        """
+        Create(String str) -> AcceleratorEntry
+
+        Create accelerator corresponding to the specified string, or None if
+        it coulnd't be parsed.
+        """
+        return _core_.AcceleratorEntry_Create(*args, **kwargs)
+
+    Create = staticmethod(Create)
    def GetFlags(*args, **kwargs):
        """
        GetFlags(self) -> int
@@ -7525,11 +7599,43 @@ class AcceleratorEntry(object):
        """
        return _core_.AcceleratorEntry_GetCommand(*args, **kwargs)

+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _core_.AcceleratorEntry_IsOk(*args, **kwargs)
+
+    def ToString(*args, **kwargs):
+        """
+        ToString(self) -> String
+
+        Returns a string representation for the this accelerator.  The string
+        is formatted using the <flags>-<keycode> format where <flags> maybe a
+        hyphen-separed list of "shift|alt|ctrl"
+
+        """
+        return _core_.AcceleratorEntry_ToString(*args, **kwargs)
+
+    def FromString(*args, **kwargs):
+        """
+        FromString(self, String str) -> bool
+
+        Returns true if the given string correctly initialized this object.
+        """
+        return _core_.AcceleratorEntry_FromString(*args, **kwargs)
+
    Command = property(GetCommand,doc="See `GetCommand`") 
    Flags = property(GetFlags,doc="See `GetFlags`") 
    KeyCode = property(GetKeyCode,doc="See `GetKeyCode`") 
 _core_.AcceleratorEntry_swigregister(AcceleratorEntry)

+def AcceleratorEntry_Create(*args, **kwargs):
+  """
+    AcceleratorEntry_Create(String str) -> AcceleratorEntry
+
+    Create accelerator corresponding to the specified string, or None if
+    it coulnd't be parsed.
+    """
+  return _core_.AcceleratorEntry_Create(*args, **kwargs)
+
 class AcceleratorTable(Object):
    """
    An accelerator table allows the application to specify a table of
@@ -7766,6 +7872,32 @@ class Window(EvtHandler):
        return _core_.Window_PrevControlId(*args, **kwargs)

    PrevControlId = staticmethod(PrevControlId)
+    def GetLayoutDirection(*args, **kwargs):
+        """
+        GetLayoutDirection(self) -> wxLayoutDirection
+
+        Get the layout direction (LTR or RTL) for this window.  Returns
+        ``wx.Layout_Default`` if layout direction is not supported.
+        """
+        return _core_.Window_GetLayoutDirection(*args, **kwargs)
+
+    def SetLayoutDirection(*args, **kwargs):
+        """
+        SetLayoutDirection(self, wxLayoutDirection dir)
+
+        Set the layout direction (LTR or RTL) for this window.
+        """
+        return _core_.Window_SetLayoutDirection(*args, **kwargs)
+
+    def AdjustForLayoutDirection(*args, **kwargs):
+        """
+        AdjustForLayoutDirection(self, int x, int width, int widthTotal) -> int
+
+        Mirror coordinates for RTL layout if this window uses it and if the
+        mirroring is not done automatically like Win32.
+        """
+        return _core_.Window_AdjustForLayoutDirection(*args, **kwargs)
+
    def SetSize(*args, **kwargs):
        """
        SetSize(self, Size size)
@@ -9776,11 +9908,9 @@ class Window(EvtHandler):
    ExtraStyle = property(GetExtraStyle,SetExtraStyle,doc="See `GetExtraStyle` and `SetExtraStyle`") 
    Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
    ForegroundColour = property(GetForegroundColour,SetForegroundColour,doc="See `GetForegroundColour` and `SetForegroundColour`") 
-    FullTextExtent = property(GetFullTextExtent,doc="See `GetFullTextExtent`") 
    GrandParent = property(GetGrandParent,doc="See `GetGrandParent`") 
    Handle = property(GetHandle,doc="See `GetHandle`") 
    HelpText = property(GetHelpText,SetHelpText,doc="See `GetHelpText` and `SetHelpText`") 
-    HelpTextAtPoint = property(GetHelpTextAtPoint,doc="See `GetHelpTextAtPoint`") 
    Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
    Label = property(GetLabel,SetLabel,doc="See `GetLabel` and `SetLabel`") 
    MaxHeight = property(GetMaxHeight,doc="See `GetMaxHeight`") 
@@ -9795,12 +9925,8 @@ class Window(EvtHandler):
    Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") 
    ScreenPosition = property(GetScreenPosition,doc="See `GetScreenPosition`") 
    ScreenRect = property(GetScreenRect,doc="See `GetScreenRect`") 
-    ScrollPos = property(GetScrollPos,SetScrollPos,doc="See `GetScrollPos` and `SetScrollPos`") 
-    ScrollRange = property(GetScrollRange,doc="See `GetScrollRange`") 
-    ScrollThumb = property(GetScrollThumb,doc="See `GetScrollThumb`") 
    Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") 
    Sizer = property(GetSizer,SetSizer,doc="See `GetSizer` and `SetSizer`") 
-    TextExtent = property(GetTextExtent,doc="See `GetTextExtent`") 
    ThemeEnabled = property(GetThemeEnabled,SetThemeEnabled,doc="See `GetThemeEnabled` and `SetThemeEnabled`") 
    ToolTip = property(GetToolTip,SetToolTip,doc="See `GetToolTip` and `SetToolTip`") 
    UpdateClientRect = property(GetUpdateClientRect,doc="See `GetUpdateClientRect`") 
@@ -9810,6 +9936,9 @@ class Window(EvtHandler):
    WindowStyle = property(GetWindowStyle,SetWindowStyle,doc="See `GetWindowStyle` and `SetWindowStyle`") 
    WindowStyleFlag = property(GetWindowStyleFlag,SetWindowStyleFlag,doc="See `GetWindowStyleFlag` and `SetWindowStyleFlag`") 
    WindowVariant = property(GetWindowVariant,SetWindowVariant,doc="See `GetWindowVariant` and `SetWindowVariant`") 
+    Shown = property(IsShown,Show,doc="See `IsShown` and `Show`") 
+    Enabled = property(IsEnabled,Enable,doc="See `IsEnabled` and `Enable`") 
+    TopLevel = property(IsTopLevel,doc="See `IsTopLevel`") 
 _core_.Window_swigregister(Window)

 def PreWindow(*args, **kwargs):
@@ -10038,7 +10167,10 @@ class Menu(EvtHandler):
        self._setOORInfo(self)

    def Append(*args, **kwargs):
-        """Append(self, int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -> MenuItem"""
+        """
+        Append(self, int id, String text=EmptyString, String help=EmptyString, 
+            int kind=ITEM_NORMAL) -> MenuItem
+        """
        return _core_.Menu_Append(*args, **kwargs)

    def AppendSeparator(*args, **kwargs):
@@ -10079,7 +10211,7 @@ class Menu(EvtHandler):

    def Insert(*args, **kwargs):
        """
-        Insert(self, size_t pos, int id, String text, String help=EmptyString, 
+        Insert(self, size_t pos, int id, String text=EmptyString, String help=EmptyString, 
            int kind=ITEM_NORMAL) -> MenuItem
        """
        return _core_.Menu_Insert(*args, **kwargs)
@@ -10101,7 +10233,10 @@ class Menu(EvtHandler):
        return _core_.Menu_InsertMenu(*args, **kwargs)

    def Prepend(*args, **kwargs):
-        """Prepend(self, int id, String text, String help=EmptyString, int kind=ITEM_NORMAL) -> MenuItem"""
+        """
+        Prepend(self, int id, String text=EmptyString, String help=EmptyString, 
+            int kind=ITEM_NORMAL) -> MenuItem
+        """
        return _core_.Menu_Prepend(*args, **kwargs)

    def PrependSeparator(*args, **kwargs):
@@ -10402,6 +10537,19 @@ class MenuBar(Window):
        return _core_.MenuBar_GetAutoWindowMenu(*args, **kwargs)

    GetAutoWindowMenu = staticmethod(GetAutoWindowMenu)
+    def GetMenus(self):
+        """Return a list of (menu, label) items for the menus in the MenuBar. """
+        return [(self.GetMenu(i), self.GetLabelTop(i)) 
+                for i in range(self.GetMenuCount())]
+        
+    def SetMenus(self, items):
+        """Clear and add new menus to the MenuBar from a list of (menu, label) items. """
+        for i in range(self.GetMenuCount()-1, -1, -1):
+            self.Remove(i)
+        for m, l in items:
+            self.Append(m, l)
+
+    Menus = property(GetMenus,SetMenus) 
 _core_.MenuBar_swigregister(MenuBar)

 def MenuBar_SetAutoWindowMenu(*args, **kwargs):
@@ -10896,6 +11044,21 @@ class ItemContainer(object):
        """
        return _core_.ItemContainer_Select(*args, **kwargs)

+    def GetItems(self):
+        """Return a list of the strings in the control"""
+        return [self.GetString(i) for i in xrange(self.GetCount())]
+        
+    def SetItems(self, items):
+        """Clear and set the strings in the control from a list"""
+        self.Clear()
+        for i in items:
+            self.Append(i)        
+
+    Count = property(GetCount,doc="See `GetCount`") 
+    Items = property(GetItems,SetItems,doc="See `GetItems` and `SetItems`") 
+    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
+    StringSelection = property(GetStringSelection,SetStringSelection,doc="See `GetStringSelection` and `SetStringSelection`") 
+    Strings = property(GetStrings,doc="See `GetStrings`") 
 _core_.ItemContainer_swigregister(ItemContainer)

 #---------------------------------------------------------------------------
@@ -11354,6 +11517,57 @@ class Sizer(Object):
        """_SetItemMinSize(self, PyObject item, Size size)"""
        return _core_.Sizer__SetItemMinSize(*args, **kwargs)

+    def _ReplaceWin(*args, **kwargs):
+        """_ReplaceWin(self, Window oldwin, Window newwin, bool recursive=False) -> bool"""
+        return _core_.Sizer__ReplaceWin(*args, **kwargs)
+
+    def _ReplaceSizer(*args, **kwargs):
+        """_ReplaceSizer(self, Sizer oldsz, Sizer newsz, bool recursive=False) -> bool"""
+        return _core_.Sizer__ReplaceSizer(*args, **kwargs)
+
+    def _ReplaceItem(*args, **kwargs):
+        """_ReplaceItem(self, size_t index, SizerItem newitem) -> bool"""
+        return _core_.Sizer__ReplaceItem(*args, **kwargs)
+
+    def Replace(self, olditem, item, recursive=False):
+        """
+        Detaches the given ``olditem`` from the sizer and replaces it with
+        ``item`` which can be a window, sizer, or `wx.SizerItem`.  The
+        detached child is destroyed only if it is not a window, (because
+        windows are owned by their parent, not the sizer.)  The
+        ``recursive`` parameter can be used to search for the given
+        element recursivly in subsizers.
+
+        This method does not cause any layout or resizing to take place,
+        call `Layout` to do so.
+
+        Returns ``True`` if the child item was found and removed.
+        """
+        if isinstance(olditem, wx.Window):
+            return self._ReplaceWin(olditem, item, recursive)
+        elif isinstnace(olditem, wx.Sizer):
+            return self._ReplaceSizer(olditem, item, recursive)
+        elif isinstnace(olditem, int):
+            return self._ReplaceItem(olditem, item)
+        else:
+            raise TypeError("Expected Window, Sizer, or integer for first parameter.")
+
+    def SetContainingWindow(*args, **kwargs):
+        """
+        SetContainingWindow(self, Window window)
+
+        Set (or unset) the window this sizer is used in.
+        """
+        return _core_.Sizer_SetContainingWindow(*args, **kwargs)
+
+    def GetContainingWindow(*args, **kwargs):
+        """
+        GetContainingWindow(self) -> Window
+
+        Get the window this sizer is used in.
+        """
+        return _core_.Sizer_GetContainingWindow(*args, **kwargs)
+
    def SetItemMinSize(self, item, *args):
        """
        SetItemMinSize(self, item, Size size)
@@ -11903,6 +12117,10 @@ class GridSizer(Sizer):
            cols = (nitems + rows - 1) / rows
        return (rows, cols)

+    Cols = property(GetCols,SetCols,doc="See `GetCols` and `SetCols`") 
+    HGap = property(GetHGap,SetHGap,doc="See `GetHGap` and `SetHGap`") 
+    Rows = property(GetRows,SetRows,doc="See `GetRows` and `SetRows`") 
+    VGap = property(GetVGap,SetVGap,doc="See `GetVGap` and `SetVGap`") 
 _core_.GridSizer_swigregister(GridSizer)

 #---------------------------------------------------------------------------
@@ -12035,8 +12253,6 @@ class FlexGridSizer(GridSizer):
            ==========================  =================================================

        Note that this method does not trigger relayout.
-
-
        """
        return _core_.FlexGridSizer_SetNonFlexibleGrowMode(*args, **kwargs)

@@ -12069,6 +12285,10 @@ class FlexGridSizer(GridSizer):
        """
        return _core_.FlexGridSizer_GetColWidths(*args, **kwargs)

+    ColWidths = property(GetColWidths,doc="See `GetColWidths`") 
+    FlexibleDirection = property(GetFlexibleDirection,SetFlexibleDirection,doc="See `GetFlexibleDirection` and `SetFlexibleDirection`") 
+    NonFlexibleGrowMode = property(GetNonFlexibleGrowMode,SetNonFlexibleGrowMode,doc="See `GetNonFlexibleGrowMode` and `SetNonFlexibleGrowMode`") 
+    RowHeights = property(GetRowHeights,doc="See `GetRowHeights`") 
 _core_.FlexGridSizer_swigregister(FlexGridSizer)

 class StdDialogButtonSizer(BoxSizer):
@@ -12405,6 +12625,10 @@ class GBSizerItem(SizerItem):
        """
        return _core_.GBSizerItem_SetGBSizer(*args, **kwargs)

+    EndPos = property(GetEndPos,doc="See `GetEndPos`") 
+    GBSizer = property(GetGBSizer,SetGBSizer,doc="See `GetGBSizer` and `SetGBSizer`") 
+    Pos = property(GetPos,SetPos,doc="See `GetPos` and `SetPos`") 
+    Span = property(GetSpan,SetSpan,doc="See `GetSpan` and `SetSpan`") 
 _core_.GBSizerItem_swigregister(GBSizerItem)
 DefaultSpan = cvar.DefaultSpan

@@ -12816,6 +13040,14 @@ class IndividualLayoutConstraint(Object):
        """
        return _core_.IndividualLayoutConstraint_GetEdge(*args, **kwargs)

+    Done = property(GetDone,SetDone,doc="See `GetDone` and `SetDone`") 
+    Margin = property(GetMargin,SetMargin,doc="See `GetMargin` and `SetMargin`") 
+    MyEdge = property(GetMyEdge,doc="See `GetMyEdge`") 
+    OtherEdge = property(GetOtherEdge,doc="See `GetOtherEdge`") 
+    OtherWindow = property(GetOtherWindow,doc="See `GetOtherWindow`") 
+    Percent = property(GetPercent,doc="See `GetPercent`") 
+    Relationship = property(GetRelationship,SetRelationship,doc="See `GetRelationship` and `SetRelationship`") 
+    Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") 
 _core_.IndividualLayoutConstraint_swigregister(IndividualLayoutConstraint)

 class LayoutConstraints(Object):
@@ -13120,6 +13352,8 @@ class FutureCall:
            # if it wasn't restarted, then cleanup
            wx.CallAfter(self.Stop)

+    Interval = property(GetInterval)
+    Result = property(GetResult)


 #----------------------------------------------------------------------------
--- a/wxPython/src/mac/_core_wrap.cpp
+++ b/wxPython/src/mac/_core_wrap.cpp
@@ -2533,70 +2533,71 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxJPEGHandler swig_types[67]
 #define SWIGTYPE_p_wxKeyEvent swig_types[68]
 #define SWIGTYPE_p_wxLayoutConstraints swig_types[69]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[70]
-#define SWIGTYPE_p_wxMemoryFSHandler swig_types[71]
-#define SWIGTYPE_p_wxMenu swig_types[72]
-#define SWIGTYPE_p_wxMenuBar swig_types[73]
-#define SWIGTYPE_p_wxMenuBarBase swig_types[74]
-#define SWIGTYPE_p_wxMenuEvent swig_types[75]
-#define SWIGTYPE_p_wxMenuItem swig_types[76]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[77]
-#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[78]
-#define SWIGTYPE_p_wxMouseEvent swig_types[79]
-#define SWIGTYPE_p_wxMoveEvent swig_types[80]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[81]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[82]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[83]
-#define SWIGTYPE_p_wxObject swig_types[84]
-#define SWIGTYPE_p_wxOutputStream swig_types[85]
-#define SWIGTYPE_p_wxPCXHandler swig_types[86]
-#define SWIGTYPE_p_wxPNGHandler swig_types[87]
-#define SWIGTYPE_p_wxPNMHandler swig_types[88]
-#define SWIGTYPE_p_wxPaintEvent swig_types[89]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[90]
-#define SWIGTYPE_p_wxPaperSize swig_types[91]
-#define SWIGTYPE_p_wxPoint swig_types[92]
-#define SWIGTYPE_p_wxPoint2D swig_types[93]
-#define SWIGTYPE_p_wxPropagateOnce swig_types[94]
-#define SWIGTYPE_p_wxPropagationDisabler swig_types[95]
-#define SWIGTYPE_p_wxPyApp swig_types[96]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[97]
-#define SWIGTYPE_p_wxPyDropTarget swig_types[98]
-#define SWIGTYPE_p_wxPyEvent swig_types[99]
-#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[100]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[101]
-#define SWIGTYPE_p_wxPyInputStream swig_types[102]
-#define SWIGTYPE_p_wxPySizer swig_types[103]
-#define SWIGTYPE_p_wxPyValidator swig_types[104]
-#define SWIGTYPE_p_wxQuantize swig_types[105]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[106]
-#define SWIGTYPE_p_wxRealPoint swig_types[107]
-#define SWIGTYPE_p_wxRect swig_types[108]
-#define SWIGTYPE_p_wxRegion swig_types[109]
-#define SWIGTYPE_p_wxScrollEvent swig_types[110]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[111]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[112]
-#define SWIGTYPE_p_wxShowEvent swig_types[113]
-#define SWIGTYPE_p_wxSize swig_types[114]
-#define SWIGTYPE_p_wxSizeEvent swig_types[115]
-#define SWIGTYPE_p_wxSizer swig_types[116]
-#define SWIGTYPE_p_wxSizerItem swig_types[117]
-#define SWIGTYPE_p_wxStaticBox swig_types[118]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[119]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[120]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[121]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[122]
-#define SWIGTYPE_p_wxToolTip swig_types[123]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[124]
-#define SWIGTYPE_p_wxValidator swig_types[125]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[126]
-#define SWIGTYPE_p_wxWindow swig_types[127]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[128]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[129]
-#define SWIGTYPE_p_wxXPMHandler swig_types[130]
-#define SWIGTYPE_p_wxZipFSHandler swig_types[131]
-static swig_type_info *swig_types[133];
-static swig_module_info swig_module = {swig_types, 132, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxLayoutDirection swig_types[70]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[71]
+#define SWIGTYPE_p_wxMemoryFSHandler swig_types[72]
+#define SWIGTYPE_p_wxMenu swig_types[73]
+#define SWIGTYPE_p_wxMenuBar swig_types[74]
+#define SWIGTYPE_p_wxMenuBarBase swig_types[75]
+#define SWIGTYPE_p_wxMenuEvent swig_types[76]
+#define SWIGTYPE_p_wxMenuItem swig_types[77]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[78]
+#define SWIGTYPE_p_wxMouseCaptureLostEvent swig_types[79]
+#define SWIGTYPE_p_wxMouseEvent swig_types[80]
+#define SWIGTYPE_p_wxMoveEvent swig_types[81]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[82]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[83]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[84]
+#define SWIGTYPE_p_wxObject swig_types[85]
+#define SWIGTYPE_p_wxOutputStream swig_types[86]
+#define SWIGTYPE_p_wxPCXHandler swig_types[87]
+#define SWIGTYPE_p_wxPNGHandler swig_types[88]
+#define SWIGTYPE_p_wxPNMHandler swig_types[89]
+#define SWIGTYPE_p_wxPaintEvent swig_types[90]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[91]
+#define SWIGTYPE_p_wxPaperSize swig_types[92]
+#define SWIGTYPE_p_wxPoint swig_types[93]
+#define SWIGTYPE_p_wxPoint2D swig_types[94]
+#define SWIGTYPE_p_wxPropagateOnce swig_types[95]
+#define SWIGTYPE_p_wxPropagationDisabler swig_types[96]
+#define SWIGTYPE_p_wxPyApp swig_types[97]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[98]
+#define SWIGTYPE_p_wxPyDropTarget swig_types[99]
+#define SWIGTYPE_p_wxPyEvent swig_types[100]
+#define SWIGTYPE_p_wxPyFileSystemHandler swig_types[101]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[102]
+#define SWIGTYPE_p_wxPyInputStream swig_types[103]
+#define SWIGTYPE_p_wxPySizer swig_types[104]
+#define SWIGTYPE_p_wxPyValidator swig_types[105]
+#define SWIGTYPE_p_wxQuantize swig_types[106]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[107]
+#define SWIGTYPE_p_wxRealPoint swig_types[108]
+#define SWIGTYPE_p_wxRect swig_types[109]
+#define SWIGTYPE_p_wxRegion swig_types[110]
+#define SWIGTYPE_p_wxScrollEvent swig_types[111]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[112]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[113]
+#define SWIGTYPE_p_wxShowEvent swig_types[114]
+#define SWIGTYPE_p_wxSize swig_types[115]
+#define SWIGTYPE_p_wxSizeEvent swig_types[116]
+#define SWIGTYPE_p_wxSizer swig_types[117]
+#define SWIGTYPE_p_wxSizerItem swig_types[118]
+#define SWIGTYPE_p_wxStaticBox swig_types[119]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[120]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[121]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[122]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[123]
+#define SWIGTYPE_p_wxToolTip swig_types[124]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[125]
+#define SWIGTYPE_p_wxValidator swig_types[126]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[127]
+#define SWIGTYPE_p_wxWindow swig_types[128]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[129]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[130]
+#define SWIGTYPE_p_wxXPMHandler swig_types[131]
+#define SWIGTYPE_p_wxZipFSHandler swig_types[132]
+static swig_type_info *swig_types[134];
+static swig_module_info swig_module = {swig_types, 133, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)

@@ -9861,6 +9862,33 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_FSFile_DetachStream(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFSFile *arg1 = (wxFSFile *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFSFile, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FSFile_DetachStream" "', expected argument " "1"" of type '" "wxFSFile *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFSFile * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->DetachStream();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_FSFile_GetMimeType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *resultobj = 0;
  wxFSFile *arg1 = (wxFSFile *) 0 ;
@@ -10885,6 +10913,36 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_FileSystem_RemoveHandler(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFileSystemHandler *arg1 = (wxFileSystemHandler *) 0 ;
+  wxFileSystemHandler *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "handler", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FileSystem_RemoveHandler",kwnames,&obj0)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFileSystemHandler, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileSystem_RemoveHandler" "', expected argument " "1"" of type '" "wxFileSystemHandler *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFileSystemHandler * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxFileSystemHandler *)wxFileSystem::RemoveHandler(arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxFileSystemHandler, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_FileSystem_CleanUpHandlers(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *resultobj = 0;
  
@@ -27711,6 +27769,34 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_PyApp_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxPyApp *arg1 = (wxPyApp *) 0 ;
+  wxLayoutDirection result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxPyApp, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PyApp_GetLayoutDirection" "', expected argument " "1"" of type '" "wxPyApp const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxPyApp * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxPyApp const *)arg1)->GetLayoutDirection();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_PyApp_ExitMainLoop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *resultobj = 0;
  wxPyApp *arg1 = (wxPyApp *) 0 ;
@@ -29289,6 +29375,43 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_AcceleratorEntry_Create(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxString *arg1 = 0 ;
+  wxAcceleratorEntry *result = 0 ;
+  bool temp1 = false ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "str", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:AcceleratorEntry_Create",kwnames,&obj0)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxAcceleratorEntry *)wxAcceleratorEntry::Create((wxString const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_wxAcceleratorEntry, SWIG_POINTER_OWN |  0 );
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_AcceleratorEntry_GetFlags(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *resultobj = 0;
  wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
@@ -29373,6 +29496,118 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_AcceleratorEntry_IsOk(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAcceleratorEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AcceleratorEntry_IsOk" "', expected argument " "1"" of type '" "wxAcceleratorEntry const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAcceleratorEntry * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)((wxAcceleratorEntry const *)arg1)->IsOk();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AcceleratorEntry_ToString(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
+  wxString result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxAcceleratorEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AcceleratorEntry_ToString" "', expected argument " "1"" of type '" "wxAcceleratorEntry const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAcceleratorEntry * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxAcceleratorEntry const *)arg1)->ToString();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_AcceleratorEntry_FromString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxAcceleratorEntry *arg1 = (wxAcceleratorEntry *) 0 ;
+  wxString *arg2 = 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool temp2 = false ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "str", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:AcceleratorEntry_FromString",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxAcceleratorEntry, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AcceleratorEntry_FromString" "', expected argument " "1"" of type '" "wxAcceleratorEntry *""'"); 
+  }
+  arg1 = reinterpret_cast< wxAcceleratorEntry * >(argp1);
+  {
+    arg2 = wxString_in_helper(obj1);
+    if (arg2 == NULL) SWIG_fail;
+    temp2 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->FromString((wxString const &)*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp2)
+    delete arg2;
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *AcceleratorEntry_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *obj;
  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -30483,6 +30718,137 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_Window_GetLayoutDirection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxLayoutDirection result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_GetLayoutDirection" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = ((wxWindow const *)arg1)->GetLayoutDirection();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_NewPointerObj((new wxLayoutDirection(static_cast< const wxLayoutDirection& >(result))), SWIGTYPE_p_wxLayoutDirection, SWIG_POINTER_OWN |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Window_SetLayoutDirection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  wxLayoutDirection arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "dir", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetLayoutDirection",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_SetLayoutDirection" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  {
+    res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxLayoutDirection,  0  | 0);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'"); 
+    }  
+    if (!argp2) {
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Window_SetLayoutDirection" "', expected argument " "2"" of type '" "wxLayoutDirection""'");
+    } else {
+      wxLayoutDirection * temp = reinterpret_cast< wxLayoutDirection * >(argp2);
+      arg2 = *temp;
+      if (SWIG_IsNewObj(res2)) delete temp;
+    }
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetLayoutDirection(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Window_AdjustForLayoutDirection(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  int arg2 ;
+  int arg3 ;
+  int arg4 ;
+  int result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  int val3 ;
+  int ecode3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "x",(char *) "width",(char *) "widthTotal", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Window_AdjustForLayoutDirection",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Window_AdjustForLayoutDirection" "', expected argument " "1"" of type '" "wxWindow const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  ecode2 = SWIG_AsVal_int(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_AdjustForLayoutDirection" "', expected argument " "2"" of type '" "int""'");
+  } 
+  arg2 = static_cast< int >(val2);
+  ecode3 = SWIG_AsVal_int(obj2, &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Window_AdjustForLayoutDirection" "', expected argument " "3"" of type '" "int""'");
+  } 
+  arg3 = static_cast< int >(val3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Window_AdjustForLayoutDirection" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (int)((wxWindow const *)arg1)->AdjustForLayoutDirection(arg2,arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_From_int(static_cast< int >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_SetSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
  PyObject *resultobj = 0;
  wxWindow *arg1 = (wxWindow *) 0 ;
@@ -38560,7 +38926,8 @@ SWIGINTERN PyObject *_wrap_Menu_Append(PyObject *SWIGUNUSEDPARM(self), PyObject
  PyObject *resultobj = 0;
  wxMenu *arg1 = (wxMenu *) 0 ;
  int arg2 ;
-  wxString *arg3 = 0 ;
+  wxString const &arg3_defvalue = wxPyEmptyString ;
+  wxString *arg3 = (wxString *) &arg3_defvalue ;
  wxString const &arg4_defvalue = wxPyEmptyString ;
  wxString *arg4 = (wxString *) &arg4_defvalue ;
  wxItemKind arg5 = (wxItemKind) wxITEM_NORMAL ;
@@ -38582,7 +38949,7 @@ SWIGINTERN PyObject *_wrap_Menu_Append(PyObject *SWIGUNUSEDPARM(self), PyObject
    (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:Menu_Append",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMenu, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Menu_Append" "', expected argument " "1"" of type '" "wxMenu *""'"); 
@@ -38593,11 +38960,13 @@ SWIGINTERN PyObject *_wrap_Menu_Append(PyObject *SWIGUNUSEDPARM(self), PyObject
    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Menu_Append" "', expected argument " "2"" of type '" "int""'");
  } 
  arg2 = static_cast< int >(val2);
+  if (obj2) {
    {
      arg3 = wxString_in_helper(obj2);
      if (arg3 == NULL) SWIG_fail;
      temp3 = true;
    }
+  }
  if (obj3) {
    {
      arg4 = wxString_in_helper(obj3);
@@ -39144,7 +39513,8 @@ SWIGINTERN PyObject *_wrap_Menu_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject
  wxMenu *arg1 = (wxMenu *) 0 ;
  size_t arg2 ;
  int arg3 ;
-  wxString *arg4 = 0 ;
+  wxString const &arg4_defvalue = wxPyEmptyString ;
+  wxString *arg4 = (wxString *) &arg4_defvalue ;
  wxString const &arg5_defvalue = wxPyEmptyString ;
  wxString *arg5 = (wxString *) &arg5_defvalue ;
  wxItemKind arg6 = (wxItemKind) wxITEM_NORMAL ;
@@ -39169,7 +39539,7 @@ SWIGINTERN PyObject *_wrap_Menu_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject
    (char *) "self",(char *) "pos",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OO:Menu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOO:Menu_Insert",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMenu, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Menu_Insert" "', expected argument " "1"" of type '" "wxMenu *""'"); 
@@ -39185,11 +39555,13 @@ SWIGINTERN PyObject *_wrap_Menu_Insert(PyObject *SWIGUNUSEDPARM(self), PyObject
    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Menu_Insert" "', expected argument " "3"" of type '" "int""'");
  } 
  arg3 = static_cast< int >(val3);
+  if (obj3) {
    {
      arg4 = wxString_in_helper(obj3);
      if (arg4 == NULL) SWIG_fail;
      temp4 = true;
    }
+  }
  if (obj4) {
    {
      arg5 = wxString_in_helper(obj4);
@@ -39544,7 +39916,8 @@ SWIGINTERN PyObject *_wrap_Menu_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject
  PyObject *resultobj = 0;
  wxMenu *arg1 = (wxMenu *) 0 ;
  int arg2 ;
-  wxString *arg3 = 0 ;
+  wxString const &arg3_defvalue = wxPyEmptyString ;
+  wxString *arg3 = (wxString *) &arg3_defvalue ;
  wxString const &arg4_defvalue = wxPyEmptyString ;
  wxString *arg4 = (wxString *) &arg4_defvalue ;
  wxItemKind arg5 = (wxItemKind) wxITEM_NORMAL ;
@@ -39566,7 +39939,7 @@ SWIGINTERN PyObject *_wrap_Menu_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject
    (char *) "self",(char *) "id",(char *) "text",(char *) "help",(char *) "kind", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OO:Menu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|OOO:Menu_Prepend",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxMenu, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Menu_Prepend" "', expected argument " "1"" of type '" "wxMenu *""'"); 
@@ -39577,11 +39950,13 @@ SWIGINTERN PyObject *_wrap_Menu_Prepend(PyObject *SWIGUNUSEDPARM(self), PyObject
    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Menu_Prepend" "', expected argument " "2"" of type '" "int""'");
  } 
  arg2 = static_cast< int >(val2);
+  if (obj2) {
    {
      arg3 = wxString_in_helper(obj2);
      if (arg3 == NULL) SWIG_fail;
      temp3 = true;
    }
+  }
  if (obj3) {
    {
      arg4 = wxString_in_helper(obj3);
@@ -47004,6 +47379,246 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_Sizer__ReplaceWin(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  wxWindow *arg3 = (wxWindow *) 0 ;
+  bool arg4 = (bool) false ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "oldwin",(char *) "newwin",(char *) "recursive", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Sizer__ReplaceWin",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer__ReplaceWin" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Sizer__ReplaceWin" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer__ReplaceWin" "', expected argument " "3"" of type '" "wxWindow *""'"); 
+  }
+  arg3 = reinterpret_cast< wxWindow * >(argp3);
+  if (obj3) {
+    ecode4 = SWIG_AsVal_bool(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Sizer__ReplaceWin" "', expected argument " "4"" of type '" "bool""'");
+    } 
+    arg4 = static_cast< bool >(val4);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->Replace(arg2,arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Sizer__ReplaceSizer(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  wxSizer *arg2 = (wxSizer *) 0 ;
+  wxSizer *arg3 = (wxSizer *) 0 ;
+  bool arg4 = (bool) false ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool val4 ;
+  int ecode4 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  PyObject * obj3 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "oldsz",(char *) "newsz",(char *) "recursive", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|O:Sizer__ReplaceSizer",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer__ReplaceSizer" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Sizer__ReplaceSizer" "', expected argument " "2"" of type '" "wxSizer *""'"); 
+  }
+  arg2 = reinterpret_cast< wxSizer * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer__ReplaceSizer" "', expected argument " "3"" of type '" "wxSizer *""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizer * >(argp3);
+  if (obj3) {
+    ecode4 = SWIG_AsVal_bool(obj3, &val4);
+    if (!SWIG_IsOK(ecode4)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "Sizer__ReplaceSizer" "', expected argument " "4"" of type '" "bool""'");
+    } 
+    arg4 = static_cast< bool >(val4);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->Replace(arg2,arg3,arg4);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Sizer__ReplaceItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  size_t arg2 ;
+  wxSizerItem *arg3 = (wxSizerItem *) 0 ;
+  bool result;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  PyObject * obj2 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "index",(char *) "newitem", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Sizer__ReplaceItem",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer__ReplaceItem" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Sizer__ReplaceItem" "', expected argument " "2"" of type '" "size_t""'");
+  } 
+  arg2 = static_cast< size_t >(val2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxSizerItem, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "Sizer__ReplaceItem" "', expected argument " "3"" of type '" "wxSizerItem *""'"); 
+  }
+  arg3 = reinterpret_cast< wxSizerItem * >(argp3);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)(arg1)->Replace(arg2,arg3);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Sizer_SetContainingWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "window", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_SetContainingWindow",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_SetContainingWindow" "', expected argument " "1"" of type '" "wxSizer *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Sizer_SetContainingWindow" "', expected argument " "2"" of type '" "wxWindow *""'"); 
+  }
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetContainingWindow(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_Sizer_GetContainingWindow(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxSizer *arg1 = (wxSizer *) 0 ;
+  wxWindow *result = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxSizer, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetContainingWindow" "', expected argument " "1"" of type '" "wxSizer const *""'"); 
+  }
+  arg1 = reinterpret_cast< wxSizer * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxWindow *)((wxSizer const *)arg1)->GetContainingWindow();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, 0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Sizer_AddItem(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
  PyObject *resultobj = 0;
  wxSizer *arg1 = (wxSizer *) 0 ;
@@ -53224,6 +53839,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_FSFile", (PyCFunction) _wrap_new_FSFile, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"delete_FSFile", (PyCFunction)_wrap_delete_FSFile, METH_O, NULL},
 	 { (char *)"FSFile_GetStream", (PyCFunction)_wrap_FSFile_GetStream, METH_O, NULL},
+	 { (char *)"FSFile_DetachStream", (PyCFunction)_wrap_FSFile_DetachStream, METH_O, NULL},
 	 { (char *)"FSFile_GetMimeType", (PyCFunction)_wrap_FSFile_GetMimeType, METH_O, NULL},
 	 { (char *)"FSFile_GetLocation", (PyCFunction)_wrap_FSFile_GetLocation, METH_O, NULL},
 	 { (char *)"FSFile_GetAnchor", (PyCFunction)_wrap_FSFile_GetAnchor, METH_O, NULL},
@@ -53253,6 +53869,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FileSystem_FindFirst", (PyCFunction) _wrap_FileSystem_FindFirst, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FileSystem_FindNext", (PyCFunction)_wrap_FileSystem_FindNext, METH_O, NULL},
 	 { (char *)"FileSystem_AddHandler", (PyCFunction) _wrap_FileSystem_AddHandler, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"FileSystem_RemoveHandler", (PyCFunction) _wrap_FileSystem_RemoveHandler, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FileSystem_CleanUpHandlers", (PyCFunction)_wrap_FileSystem_CleanUpHandlers, METH_NOARGS, NULL},
 	 { (char *)"FileSystem_FileNameToURL", (PyCFunction) _wrap_FileSystem_FileNameToURL, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FileSystem_URLToFileName", (PyCFunction) _wrap_FileSystem_URLToFileName, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -53819,6 +54436,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"PyApp_IsMainLoopRunning", (PyCFunction)_wrap_PyApp_IsMainLoopRunning, METH_NOARGS, NULL},
 	 { (char *)"PyApp_MainLoop", (PyCFunction)_wrap_PyApp_MainLoop, METH_O, NULL},
 	 { (char *)"PyApp_Exit", (PyCFunction)_wrap_PyApp_Exit, METH_O, NULL},
+	 { (char *)"PyApp_GetLayoutDirection", (PyCFunction)_wrap_PyApp_GetLayoutDirection, METH_O, NULL},
 	 { (char *)"PyApp_ExitMainLoop", (PyCFunction)_wrap_PyApp_ExitMainLoop, METH_O, NULL},
 	 { (char *)"PyApp_Pending", (PyCFunction)_wrap_PyApp_Pending, METH_O, NULL},
 	 { (char *)"PyApp_Dispatch", (PyCFunction)_wrap_PyApp_Dispatch, METH_O, NULL},
@@ -53878,9 +54496,13 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"new_AcceleratorEntry", (PyCFunction) _wrap_new_AcceleratorEntry, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"delete_AcceleratorEntry", (PyCFunction)_wrap_delete_AcceleratorEntry, METH_O, NULL},
 	 { (char *)"AcceleratorEntry_Set", (PyCFunction) _wrap_AcceleratorEntry_Set, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"AcceleratorEntry_Create", (PyCFunction) _wrap_AcceleratorEntry_Create, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AcceleratorEntry_GetFlags", (PyCFunction)_wrap_AcceleratorEntry_GetFlags, METH_O, NULL},
 	 { (char *)"AcceleratorEntry_GetKeyCode", (PyCFunction)_wrap_AcceleratorEntry_GetKeyCode, METH_O, NULL},
 	 { (char *)"AcceleratorEntry_GetCommand", (PyCFunction)_wrap_AcceleratorEntry_GetCommand, METH_O, NULL},
+	 { (char *)"AcceleratorEntry_IsOk", (PyCFunction)_wrap_AcceleratorEntry_IsOk, METH_O, NULL},
+	 { (char *)"AcceleratorEntry_ToString", (PyCFunction)_wrap_AcceleratorEntry_ToString, METH_O, NULL},
+	 { (char *)"AcceleratorEntry_FromString", (PyCFunction) _wrap_AcceleratorEntry_FromString, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"AcceleratorEntry_swigregister", AcceleratorEntry_swigregister, METH_VARARGS, NULL},
 	 { (char *)"AcceleratorEntry_swiginit", AcceleratorEntry_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_AcceleratorTable", (PyCFunction) _wrap_new_AcceleratorTable, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -53917,6 +54539,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Window_NewControlId", (PyCFunction)_wrap_Window_NewControlId, METH_NOARGS, NULL},
 	 { (char *)"Window_NextControlId", (PyCFunction) _wrap_Window_NextControlId, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_PrevControlId", (PyCFunction) _wrap_Window_PrevControlId, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Window_GetLayoutDirection", (PyCFunction)_wrap_Window_GetLayoutDirection, METH_O, NULL},
+	 { (char *)"Window_SetLayoutDirection", (PyCFunction) _wrap_Window_SetLayoutDirection, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Window_AdjustForLayoutDirection", (PyCFunction) _wrap_Window_AdjustForLayoutDirection, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_SetSize", (PyCFunction) _wrap_Window_SetSize, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_SetDimensions", (PyCFunction) _wrap_Window_SetDimensions, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_SetRect", (PyCFunction) _wrap_Window_SetRect, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -54349,6 +54974,11 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Sizer_Detach", (PyCFunction) _wrap_Sizer_Detach, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_GetItem", (PyCFunction) _wrap_Sizer_GetItem, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer__SetItemMinSize", (PyCFunction) _wrap_Sizer__SetItemMinSize, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer__ReplaceWin", (PyCFunction) _wrap_Sizer__ReplaceWin, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer__ReplaceSizer", (PyCFunction) _wrap_Sizer__ReplaceSizer, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer__ReplaceItem", (PyCFunction) _wrap_Sizer__ReplaceItem, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_SetContainingWindow", (PyCFunction) _wrap_Sizer_SetContainingWindow, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Sizer_GetContainingWindow", (PyCFunction)_wrap_Sizer_GetContainingWindow, METH_O, NULL},
 	 { (char *)"Sizer_AddItem", (PyCFunction) _wrap_Sizer_AddItem, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_InsertItem", (PyCFunction) _wrap_Sizer_InsertItem, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Sizer_PrependItem", (PyCFunction) _wrap_Sizer_PrependItem, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -55120,6 +55750,7 @@ static swig_type_info _swigt__p_wxItemContainer = {"_p_wxItemContainer", "wxItem
 static swig_type_info _swigt__p_wxJPEGHandler = {"_p_wxJPEGHandler", "wxJPEGHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxKeyEvent = {"_p_wxKeyEvent", "wxKeyEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxLayoutConstraints = {"_p_wxLayoutConstraints", "wxLayoutConstraints *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxLayoutDirection = {"_p_wxLayoutDirection", "wxLayoutDirection *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMaximizeEvent = {"_p_wxMaximizeEvent", "wxMaximizeEvent *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMemoryFSHandler = {"_p_wxMemoryFSHandler", "wxMemoryFSHandler *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxMenu = {"_p_wxMenu", "wxMenu *", 0, 0, (void*)0, 0};
@@ -55254,6 +55885,7 @@ static swig_type_info *swig_type_initial[] = {
  &_swigt__p_wxJPEGHandler,
  &_swigt__p_wxKeyEvent,
  &_swigt__p_wxLayoutConstraints,
+  &_swigt__p_wxLayoutDirection,
  &_swigt__p_wxMaximizeEvent,
  &_swigt__p_wxMemoryFSHandler,
  &_swigt__p_wxMenu,
@@ -55388,6 +56020,7 @@ static swig_cast_info _swigc__p_wxItemContainer[] = {  {&_swigt__p_wxControlWith
 static swig_cast_info _swigc__p_wxJPEGHandler[] = {  {&_swigt__p_wxJPEGHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxKeyEvent[] = {  {&_swigt__p_wxKeyEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxLayoutConstraints[] = {  {&_swigt__p_wxLayoutConstraints, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxLayoutDirection[] = {  {&_swigt__p_wxLayoutDirection, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMaximizeEvent[] = {  {&_swigt__p_wxMaximizeEvent, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMemoryFSHandler[] = {  {&_swigt__p_wxMemoryFSHandler, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxMenu[] = {  {&_swigt__p_wxMenu, 0, 0, 0},{0, 0, 0, 0}};
@@ -55522,6 +56155,7 @@ static swig_cast_info *swig_cast_initial[] = {
  _swigc__p_wxJPEGHandler,
  _swigc__p_wxKeyEvent,
  _swigc__p_wxLayoutConstraints,
+  _swigc__p_wxLayoutDirection,
  _swigc__p_wxMaximizeEvent,
  _swigc__p_wxMemoryFSHandler,
  _swigc__p_wxMenu,
@@ -56221,6 +56855,7 @@ SWIGEXPORT void SWIG_init(void) {
  SWIG_Python_SetConstant(d, "ID_HELP_SEARCH",SWIG_From_int(static_cast< int >(wxID_HELP_SEARCH)));
  SWIG_Python_SetConstant(d, "ID_CLOSE_ALL",SWIG_From_int(static_cast< int >(wxID_CLOSE_ALL)));
  SWIG_Python_SetConstant(d, "ID_PREFERENCES",SWIG_From_int(static_cast< int >(wxID_PREFERENCES)));
+  SWIG_Python_SetConstant(d, "ID_EDIT",SWIG_From_int(static_cast< int >(wxID_EDIT)));
  SWIG_Python_SetConstant(d, "ID_CUT",SWIG_From_int(static_cast< int >(wxID_CUT)));
  SWIG_Python_SetConstant(d, "ID_COPY",SWIG_From_int(static_cast< int >(wxID_COPY)));
  SWIG_Python_SetConstant(d, "ID_PASTE",SWIG_From_int(static_cast< int >(wxID_PASTE)));
@@ -56240,6 +56875,7 @@ SWIGEXPORT void SWIG_init(void) {
  SWIG_Python_SetConstant(d, "ID_VIEW_SORTNAME",SWIG_From_int(static_cast< int >(wxID_VIEW_SORTNAME)));
  SWIG_Python_SetConstant(d, "ID_VIEW_SORTSIZE",SWIG_From_int(static_cast< int >(wxID_VIEW_SORTSIZE)));
  SWIG_Python_SetConstant(d, "ID_VIEW_SORTTYPE",SWIG_From_int(static_cast< int >(wxID_VIEW_SORTTYPE)));
+  SWIG_Python_SetConstant(d, "ID_FILE",SWIG_From_int(static_cast< int >(wxID_FILE)));
  SWIG_Python_SetConstant(d, "ID_FILE1",SWIG_From_int(static_cast< int >(wxID_FILE1)));
  SWIG_Python_SetConstant(d, "ID_FILE2",SWIG_From_int(static_cast< int >(wxID_FILE2)));
  SWIG_Python_SetConstant(d, "ID_FILE3",SWIG_From_int(static_cast< int >(wxID_FILE3)));
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -1123,6 +1123,9 @@ class Icon(GDIObject):
        return _gdi_.Icon_CopyFromBitmap(*args, **kwargs)

    def __nonzero__(self): return self.Ok() 
+    Depth = property(GetDepth,SetDepth,doc="See `GetDepth` and `SetDepth`") 
+    Height = property(GetHeight,SetHeight,doc="See `GetHeight` and `SetHeight`") 
+    Width = property(GetWidth,SetWidth,doc="See `GetWidth` and `SetWidth`") 
 _gdi_.Icon_swigregister(Icon)

 def EmptyIcon(*args, **kwargs):
@@ -1175,6 +1178,8 @@ class IconLocation(object):
        """GetIndex(self) -> int"""
        return _gdi_.IconLocation_GetIndex(*args, **kwargs)

+    FileName = property(GetFileName,SetFileName,doc="See `GetFileName` and `SetFileName`") 
+    Index = property(GetIndex,SetIndex,doc="See `GetIndex` and `SetIndex`") 
 _gdi_.IconLocation_swigregister(IconLocation)

 class IconBundle(object):
@@ -1198,6 +1203,7 @@ class IconBundle(object):
        """GetIcon(self, Size size) -> Icon"""
        return _gdi_.IconBundle_GetIcon(*args, **kwargs)

+    Icon = property(GetIcon,doc="See `GetIcon`") 
 _gdi_.IconBundle_swigregister(IconBundle)

 def IconBundleFromFile(*args, **kwargs):
@@ -1767,6 +1773,7 @@ class FontMapper(object):
        """SetDialogTitle(self, String title)"""
        return _gdi_.FontMapper_SetDialogTitle(*args, **kwargs)

+    AltForEncoding = property(GetAltForEncoding,doc="See `GetAltForEncoding`") 
 _gdi_.FontMapper_swigregister(FontMapper)

 def FontMapper_Get(*args):
@@ -2127,6 +2134,21 @@ class Font(GDIObject):
        return _gdi_.Font_SetDefaultEncoding(*args, **kwargs)

    SetDefaultEncoding = staticmethod(SetDefaultEncoding)
+    Encoding = property(GetEncoding,SetEncoding,doc="See `GetEncoding` and `SetEncoding`") 
+    FaceName = property(GetFaceName,SetFaceName,doc="See `GetFaceName` and `SetFaceName`") 
+    Family = property(GetFamily,SetFamily,doc="See `GetFamily` and `SetFamily`") 
+    FamilyString = property(GetFamilyString,doc="See `GetFamilyString`") 
+    NativeFontInfo = property(GetNativeFontInfo,SetNativeFontInfo,doc="See `GetNativeFontInfo` and `SetNativeFontInfo`") 
+    NativeFontInfoDesc = property(GetNativeFontInfoDesc,doc="See `GetNativeFontInfoDesc`") 
+    NativeFontInfoUserDesc = property(GetNativeFontInfoUserDesc,SetNativeFontInfoUserDesc,doc="See `GetNativeFontInfoUserDesc` and `SetNativeFontInfoUserDesc`") 
+    NoAntiAliasing = property(GetNoAntiAliasing,SetNoAntiAliasing,doc="See `GetNoAntiAliasing` and `SetNoAntiAliasing`") 
+    PixelSize = property(GetPixelSize,SetPixelSize,doc="See `GetPixelSize` and `SetPixelSize`") 
+    PointSize = property(GetPointSize,SetPointSize,doc="See `GetPointSize` and `SetPointSize`") 
+    Style = property(GetStyle,SetStyle,doc="See `GetStyle` and `SetStyle`") 
+    StyleString = property(GetStyleString,doc="See `GetStyleString`") 
+    Underlined = property(GetUnderlined,SetUnderlined,doc="See `GetUnderlined` and `SetUnderlined`") 
+    Weight = property(GetWeight,SetWeight,doc="See `GetWeight` and `SetWeight`") 
+    WeightString = property(GetWeightString,doc="See `GetWeightString`") 
 _gdi_.Font_swigregister(Font)

 def FontFromNativeInfo(*args, **kwargs):
@@ -2292,6 +2314,9 @@ def FontEnumerator_IsValidFacename(*args, **kwargs):

 #---------------------------------------------------------------------------

+Layout_Default = _gdi_.Layout_Default
+Layout_LeftToRight = _gdi_.Layout_LeftToRight
+Layout_RightToLeft = _gdi_.Layout_RightToLeft
 LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT
 LANGUAGE_UNKNOWN = _gdi_.LANGUAGE_UNKNOWN
 LANGUAGE_ABKHAZIAN = _gdi_.LANGUAGE_ABKHAZIAN
@@ -2646,6 +2671,12 @@ class Locale(object):
        """GetName(self) -> String"""
        return _gdi_.Locale_GetName(*args, **kwargs)

+    CanonicalName = property(GetCanonicalName,doc="See `GetCanonicalName`") 
+    Language = property(GetLanguage,doc="See `GetLanguage`") 
+    Locale = property(GetLocale,doc="See `GetLocale`") 
+    Name = property(GetName,doc="See `GetName`") 
+    String = property(GetString,doc="See `GetString`") 
+    SysName = property(GetSysName,doc="See `GetSysName`") 
 _gdi_.Locale_swigregister(Locale)

 def Locale_GetSystemLanguage(*args):
@@ -4769,6 +4800,8 @@ class ImageList(_core.Object):
        """GetSize(index) -> (width,height)"""
        return _gdi_.ImageList_GetSize(*args, **kwargs)

+    ImageCount = property(GetImageCount,doc="See `GetImageCount`") 
+    Size = property(GetSize,doc="See `GetSize`") 
 _gdi_.ImageList_swigregister(ImageList)

 #---------------------------------------------------------------------------
@@ -5175,6 +5208,11 @@ class Effects(_core.Object):
        """TileBitmap(self, Rect rect, DC dc, Bitmap bitmap) -> bool"""
        return _gdi_.Effects_TileBitmap(*args, **kwargs)

+    DarkShadow = property(GetDarkShadow,SetDarkShadow,doc="See `GetDarkShadow` and `SetDarkShadow`") 
+    FaceColour = property(GetFaceColour,SetFaceColour,doc="See `GetFaceColour` and `SetFaceColour`") 
+    HighlightColour = property(GetHighlightColour,SetHighlightColour,doc="See `GetHighlightColour` and `SetHighlightColour`") 
+    LightShadow = property(GetLightShadow,SetLightShadow,doc="See `GetLightShadow` and `SetLightShadow`") 
+    MediumShadow = property(GetMediumShadow,SetMediumShadow,doc="See `GetMediumShadow` and `SetMediumShadow`") 
 _gdi_.Effects_swigregister(Effects)

 #---------------------------------------------------------------------------
--- a/wxPython/src/mac/_gdi_wrap.cpp
+++ b/wxPython/src/mac/_gdi_wrap.cpp
@@ -33123,6 +33123,9 @@ SWIGEXPORT void SWIG_init(void) {
  
  wxPyPtrTypeMap_Add("wxFontEnumerator", "wxPyFontEnumerator");
  
+  SWIG_Python_SetConstant(d, "Layout_Default",SWIG_From_int(static_cast< int >(wxLayout_Default)));
+  SWIG_Python_SetConstant(d, "Layout_LeftToRight",SWIG_From_int(static_cast< int >(wxLayout_LeftToRight)));
+  SWIG_Python_SetConstant(d, "Layout_RightToLeft",SWIG_From_int(static_cast< int >(wxLayout_RightToLeft)));
  SWIG_Python_SetConstant(d, "LANGUAGE_DEFAULT",SWIG_From_int(static_cast< int >(wxLANGUAGE_DEFAULT)));
  SWIG_Python_SetConstant(d, "LANGUAGE_UNKNOWN",SWIG_From_int(static_cast< int >(wxLANGUAGE_UNKNOWN)));
  SWIG_Python_SetConstant(d, "LANGUAGE_ABKHAZIAN",SWIG_From_int(static_cast< int >(wxLANGUAGE_ABKHAZIAN)));
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -295,10 +295,18 @@ def IsStockID(*args, **kwargs):
 def IsStockLabel(*args, **kwargs):
  """IsStockLabel(int id, String label) -> bool"""
  return _misc_.IsStockLabel(*args, **kwargs)
+STOCK_NOFLAGS = _misc_.STOCK_NOFLAGS
+STOCK_WITH_MNEMONIC = _misc_.STOCK_WITH_MNEMONIC
+STOCK_WITH_ACCELERATOR = _misc_.STOCK_WITH_ACCELERATOR

 def GetStockLabel(*args, **kwargs):
-  """GetStockLabel(int id, bool withCodes=True, String accelerator=EmptyString) -> String"""
+  """GetStockLabel(int id, long flags=STOCK_WITH_MNEMONIC) -> String"""
  return _misc_.GetStockLabel(*args, **kwargs)
+STOCK_MENU = _misc_.STOCK_MENU
+
+def GetStockHelpString(*args, **kwargs):
+  """GetStockHelpString(int id, int client=STOCK_MENU) -> String"""
+  return _misc_.GetStockHelpString(*args, **kwargs)

 def Bell(*args):
  """Bell()"""
@@ -1001,6 +1009,10 @@ class FileHistory(_core.Object):
        return _misc_.FileHistory_GetCount(*args, **kwargs)

    GetNoHistoryFiles = GetCount 
+    Count = property(GetCount,doc="See `GetCount`") 
+    HistoryFile = property(GetHistoryFile,doc="See `GetHistoryFile`") 
+    MaxFiles = property(GetMaxFiles,doc="See `GetMaxFiles`") 
+    NoHistoryFiles = property(GetNoHistoryFiles,doc="See `GetNoHistoryFiles`") 
 _misc_.FileHistory_swigregister(FileHistory)

 class SingleInstanceChecker(object):
@@ -1656,6 +1668,8 @@ class LogWindow(Log):
        """PassMessages(self, bool bDoPass)"""
        return _misc_.LogWindow_PassMessages(*args, **kwargs)

+    Frame = property(GetFrame,doc="See `GetFrame`") 
+    OldLog = property(GetOldLog,doc="See `GetOldLog`") 
 _misc_.LogWindow_swigregister(LogWindow)

 class LogChain(Log):
@@ -1681,6 +1695,7 @@ class LogChain(Log):
        """GetOldLog(self) -> Log"""
        return _misc_.LogChain_GetOldLog(*args, **kwargs)

+    OldLog = property(GetOldLog,doc="See `GetOldLog`") 
 _misc_.LogChain_swigregister(LogChain)

 class LogBuffer(Log):
@@ -1694,6 +1709,7 @@ class LogBuffer(Log):
        """GetBuffer(self) -> String"""
        return _misc_.LogBuffer_GetBuffer(*args, **kwargs)

+    Buffer = property(GetBuffer,doc="See `GetBuffer`") 
 _misc_.LogBuffer_swigregister(LogBuffer)


@@ -2126,6 +2142,37 @@ class Joystick(object):
        return _misc_.Joystick_ReleaseCapture(*args, **kwargs)

    def __nonzero__(self): return self.IsOk() 
+    ButtonState = property(GetButtonState,doc="See `GetButtonState`") 
+    ManufacturerId = property(GetManufacturerId,doc="See `GetManufacturerId`") 
+    MaxAxes = property(GetMaxAxes,doc="See `GetMaxAxes`") 
+    MaxButtons = property(GetMaxButtons,doc="See `GetMaxButtons`") 
+    MovementThreshold = property(GetMovementThreshold,SetMovementThreshold,doc="See `GetMovementThreshold` and `SetMovementThreshold`") 
+    NumberAxes = property(GetNumberAxes,doc="See `GetNumberAxes`") 
+    NumberButtons = property(GetNumberButtons,doc="See `GetNumberButtons`") 
+    NumberJoysticks = property(GetNumberJoysticks,doc="See `GetNumberJoysticks`") 
+    POVCTSPosition = property(GetPOVCTSPosition,doc="See `GetPOVCTSPosition`") 
+    POVPosition = property(GetPOVPosition,doc="See `GetPOVPosition`") 
+    PollingMax = property(GetPollingMax,doc="See `GetPollingMax`") 
+    PollingMin = property(GetPollingMin,doc="See `GetPollingMin`") 
+    Position = property(GetPosition,doc="See `GetPosition`") 
+    ProductId = property(GetProductId,doc="See `GetProductId`") 
+    ProductName = property(GetProductName,doc="See `GetProductName`") 
+    RudderMax = property(GetRudderMax,doc="See `GetRudderMax`") 
+    RudderMin = property(GetRudderMin,doc="See `GetRudderMin`") 
+    RudderPosition = property(GetRudderPosition,doc="See `GetRudderPosition`") 
+    UMax = property(GetUMax,doc="See `GetUMax`") 
+    UMin = property(GetUMin,doc="See `GetUMin`") 
+    UPosition = property(GetUPosition,doc="See `GetUPosition`") 
+    VMax = property(GetVMax,doc="See `GetVMax`") 
+    VMin = property(GetVMin,doc="See `GetVMin`") 
+    VPosition = property(GetVPosition,doc="See `GetVPosition`") 
+    XMax = property(GetXMax,doc="See `GetXMax`") 
+    XMin = property(GetXMin,doc="See `GetXMin`") 
+    YMax = property(GetYMax,doc="See `GetYMax`") 
+    YMin = property(GetYMin,doc="See `GetYMin`") 
+    ZMax = property(GetZMax,doc="See `GetZMax`") 
+    ZMin = property(GetZMin,doc="See `GetZMin`") 
+    ZPosition = property(GetZPosition,doc="See `GetZPosition`") 
 _misc_.Joystick_swigregister(Joystick)

 wxEVT_JOY_BUTTON_DOWN = _misc_.wxEVT_JOY_BUTTON_DOWN
@@ -2212,6 +2259,11 @@ class JoystickEvent(_core.Event):
    m_buttonState = property(GetButtonState, SetButtonState)
    m_joyStick = property(GetJoystick, SetJoystick)

+    ButtonChange = property(GetButtonChange,SetButtonChange,doc="See `GetButtonChange` and `SetButtonChange`") 
+    ButtonState = property(GetButtonState,SetButtonState,doc="See `GetButtonState` and `SetButtonState`") 
+    Joystick = property(GetJoystick,SetJoystick,doc="See `GetJoystick` and `SetJoystick`") 
+    Position = property(GetPosition,SetPosition,doc="See `GetPosition` and `SetPosition`") 
+    ZPosition = property(GetZPosition,SetZPosition,doc="See `GetZPosition` and `SetZPosition`") 
 _misc_.JoystickEvent_swigregister(JoystickEvent)

 EVT_JOY_BUTTON_DOWN = wx.PyEventBinder( wxEVT_JOY_BUTTON_DOWN )
@@ -2344,6 +2396,15 @@ class FileTypeInfo(object):
        """GetIconIndex(self) -> int"""
        return _misc_.FileTypeInfo_GetIconIndex(*args, **kwargs)

+    Description = property(GetDescription,doc="See `GetDescription`") 
+    Extensions = property(GetExtensions,doc="See `GetExtensions`") 
+    ExtensionsCount = property(GetExtensionsCount,doc="See `GetExtensionsCount`") 
+    IconFile = property(GetIconFile,doc="See `GetIconFile`") 
+    IconIndex = property(GetIconIndex,doc="See `GetIconIndex`") 
+    MimeType = property(GetMimeType,doc="See `GetMimeType`") 
+    OpenCommand = property(GetOpenCommand,doc="See `GetOpenCommand`") 
+    PrintCommand = property(GetPrintCommand,doc="See `GetPrintCommand`") 
+    ShortDesc = property(GetShortDesc,SetShortDesc,doc="See `GetShortDesc` and `SetShortDesc`") 
 _misc_.FileTypeInfo_swigregister(FileTypeInfo)

 def FileTypeInfoSequence(*args, **kwargs):
@@ -2418,6 +2479,15 @@ class FileType(object):
        return _misc_.FileType_ExpandCommand(*args, **kwargs)

    ExpandCommand = staticmethod(ExpandCommand)
+    AllCommands = property(GetAllCommands,doc="See `GetAllCommands`") 
+    Description = property(GetDescription,doc="See `GetDescription`") 
+    Extensions = property(GetExtensions,doc="See `GetExtensions`") 
+    Icon = property(GetIcon,doc="See `GetIcon`") 
+    IconInfo = property(GetIconInfo,doc="See `GetIconInfo`") 
+    MimeType = property(GetMimeType,doc="See `GetMimeType`") 
+    MimeTypes = property(GetMimeTypes,doc="See `GetMimeTypes`") 
+    OpenCommand = property(GetOpenCommand,doc="See `GetOpenCommand`") 
+    PrintCommand = property(GetPrintCommand,doc="See `GetPrintCommand`") 
 _misc_.FileType_swigregister(FileType)

 def FileType_ExpandCommand(*args, **kwargs):
@@ -5022,6 +5092,7 @@ class FileDataObject(DataObjectSimple):
        """
        return _misc_.FileDataObject_AddFile(*args, **kwargs)

+    Filenames = property(GetFilenames,doc="See `GetFilenames`") 
 _misc_.FileDataObject_swigregister(FileDataObject)

 class CustomDataObject(DataObjectSimple):
--- a/wxPython/src/mac/_misc_wrap.cpp
+++ b/wxPython/src/mac/_misc_wrap.cpp
@@ -4789,44 +4789,81 @@ fail:
 SWIGINTERN PyObject *_wrap_GetStockLabel(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
  PyObject *resultobj = 0;
  int arg1 ;
-  bool arg2 = (bool) true ;
-  wxString arg3 = (wxString) wxPyEmptyString ;
+  long arg2 = (long) wxSTOCK_WITH_MNEMONIC ;
  wxString result;
  int val1 ;
  int ecode1 = 0 ;
-  bool val2 ;
+  long val2 ;
  int ecode2 = 0 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
-  PyObject * obj2 = 0 ;
  char *  kwnames[] = {
-    (char *) "id",(char *) "withCodes",(char *) "accelerator", NULL 
+    (char *) "id",(char *) "flags", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:GetStockLabel",kwnames,&obj0,&obj1,&obj2)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:GetStockLabel",kwnames,&obj0,&obj1)) SWIG_fail;
  ecode1 = SWIG_AsVal_int(obj0, &val1);
  if (!SWIG_IsOK(ecode1)) {
    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "GetStockLabel" "', expected argument " "1"" of type '" "int""'");
  } 
  arg1 = static_cast< int >(val1);
  if (obj1) {
-    ecode2 = SWIG_AsVal_bool(obj1, &val2);
+    ecode2 = SWIG_AsVal_long(obj1, &val2);
    if (!SWIG_IsOK(ecode2)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GetStockLabel" "', expected argument " "2"" of type '" "bool""'");
-    } 
-    arg2 = static_cast< bool >(val2);
-  }
-  if (obj2) {
-    {
-      wxString* sptr = wxString_in_helper(obj2);
-      if (sptr == NULL) SWIG_fail;
-      arg3 = *sptr;
-      delete sptr;
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GetStockLabel" "', expected argument " "2"" of type '" "long""'");
    } 
+    arg2 = static_cast< long >(val2);
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = wxGetStockLabel(arg1,arg2,arg3);
+    result = wxGetStockLabel(arg1,arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+#if wxUSE_UNICODE
+    resultobj = PyUnicode_FromWideChar((&result)->c_str(), (&result)->Len());
+#else
+    resultobj = PyString_FromStringAndSize((&result)->c_str(), (&result)->Len());
+#endif
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_GetStockHelpString(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  int arg1 ;
+  wxStockHelpStringClient arg2 = (wxStockHelpStringClient) wxSTOCK_MENU ;
+  wxString result;
+  int val1 ;
+  int ecode1 = 0 ;
+  int val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "id",(char *) "client", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:GetStockHelpString",kwnames,&obj0,&obj1)) SWIG_fail;
+  ecode1 = SWIG_AsVal_int(obj0, &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "GetStockHelpString" "', expected argument " "1"" of type '" "int""'");
+  } 
+  arg1 = static_cast< int >(val1);
+  if (obj1) {
+    ecode2 = SWIG_AsVal_int(obj1, &val2);
+    if (!SWIG_IsOK(ecode2)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "GetStockHelpString" "', expected argument " "2"" of type '" "wxStockHelpStringClient""'");
+    } 
+    arg2 = static_cast< wxStockHelpStringClient >(val2);
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = wxGetStockHelpString(arg1,arg2);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -37287,6 +37324,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"IsStockID", (PyCFunction) _wrap_IsStockID, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"IsStockLabel", (PyCFunction) _wrap_IsStockLabel, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"GetStockLabel", (PyCFunction) _wrap_GetStockLabel, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"GetStockHelpString", (PyCFunction) _wrap_GetStockHelpString, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Bell", (PyCFunction)_wrap_Bell, METH_NOARGS, NULL},
 	 { (char *)"EndBusyCursor", (PyCFunction)_wrap_EndBusyCursor, METH_NOARGS, NULL},
 	 { (char *)"GetElapsedTime", (PyCFunction) _wrap_GetElapsedTime, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -40054,6 +40092,10 @@ SWIGEXPORT void SWIG_init(void) {
  SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorPromptStr",FileSelectorPromptStr_get, FileSelectorPromptStr_set);
  SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
  SWIG_addvarlink(SWIG_globals(),(char*)"DirSelectorPromptStr",DirSelectorPromptStr_get, DirSelectorPromptStr_set);
+  SWIG_Python_SetConstant(d, "STOCK_NOFLAGS",SWIG_From_int(static_cast< int >(wxSTOCK_NOFLAGS)));
+  SWIG_Python_SetConstant(d, "STOCK_WITH_MNEMONIC",SWIG_From_int(static_cast< int >(wxSTOCK_WITH_MNEMONIC)));
+  SWIG_Python_SetConstant(d, "STOCK_WITH_ACCELERATOR",SWIG_From_int(static_cast< int >(wxSTOCK_WITH_ACCELERATOR)));
+  SWIG_Python_SetConstant(d, "STOCK_MENU",SWIG_From_int(static_cast< int >(wxSTOCK_MENU)));
  SWIG_Python_SetConstant(d, "SHUTDOWN_POWEROFF",SWIG_From_int(static_cast< int >(wxSHUTDOWN_POWEROFF)));
  SWIG_Python_SetConstant(d, "SHUTDOWN_REBOOT",SWIG_From_int(static_cast< int >(wxSHUTDOWN_REBOOT)));
  SWIG_Python_SetConstant(d, "OS_UNKNOWN",SWIG_From_int(static_cast< int >(wxOS_UNKNOWN)));
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -591,6 +591,10 @@ class Frame(TopLevelWindow):
        return _windows_.Frame_GetClassDefaultAttributes(*args, **kwargs)

    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    MenuBar = property(GetMenuBar,SetMenuBar,doc="See `GetMenuBar` and `SetMenuBar`") 
+    StatusBar = property(GetStatusBar,SetStatusBar,doc="See `GetStatusBar` and `SetStatusBar`") 
+    StatusBarPane = property(GetStatusBarPane,SetStatusBarPane,doc="See `GetStatusBarPane` and `SetStatusBarPane`") 
+    ToolBar = property(GetToolBar,SetToolBar,doc="See `GetToolBar` and `SetToolBar`") 
 _windows_.Frame_swigregister(Frame)

 def PreFrame(*args, **kwargs):
@@ -905,6 +909,17 @@ class StatusBar(_core.Window):
        return _windows_.StatusBar_GetClassDefaultAttributes(*args, **kwargs)

    GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    def GetFields(self):
+        """Return a list of field values in the status bar. """
+        return [self.GetStatusText(i) for i in range(self.GetFieldsCount())]
+        
+    def SetFields(self, items):
+        """Set the values of the statusbar fields from a list of strings. """
+        self.SetFieldsCount(len(items))
+        for i in range(len(items)):
+            self.SetStatusText(items[i], i)
+
+    Fields = property(GetFields,SetFields) 
 _windows_.StatusBar_swigregister(StatusBar)

 def PreStatusBar(*args, **kwargs):
@@ -1752,11 +1767,19 @@ class VScrolledWindow(Panel):
        return _windows_.VScrolledWindow_RefreshLines(*args, **kwargs)

    def HitTestXY(*args, **kwargs):
-        """HitTestXY(self, int x, int y) -> int"""
+        """
+        HitTestXY(self, int x, int y) -> int
+
+        Test where the given (in client coords) point lies
+        """
        return _windows_.VScrolledWindow_HitTestXY(*args, **kwargs)

    def HitTest(*args, **kwargs):
-        """HitTest(self, Point pt) -> int"""
+        """
+        HitTest(self, Point pt) -> int
+
+        Test where the given (in client coords) point lies
+        """
        return _windows_.VScrolledWindow_HitTest(*args, **kwargs)

    def RefreshAll(*args, **kwargs):
@@ -1960,6 +1983,7 @@ class HtmlListBox(VListBox):
        """OnLinkClicked(self, size_t n, wxHtmlLinkInfo link)"""
        return _windows_.HtmlListBox_OnLinkClicked(*args, **kwargs)

+    FileSystem = property(GetFileSystem,doc="See `GetFileSystem`") 
 _windows_.HtmlListBox_swigregister(HtmlListBox)

 def PreHtmlListBox(*args, **kwargs):
@@ -2377,6 +2401,14 @@ class FileDialog(Dialog):
        """
        return _windows_.FileDialog_GetPaths(*args, **kwargs)

+    Directory = property(GetDirectory,SetDirectory,doc="See `GetDirectory` and `SetDirectory`") 
+    Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") 
+    Filenames = property(GetFilenames,doc="See `GetFilenames`") 
+    FilterIndex = property(GetFilterIndex,SetFilterIndex,doc="See `GetFilterIndex` and `SetFilterIndex`") 
+    Message = property(GetMessage,SetMessage,doc="See `GetMessage` and `SetMessage`") 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+    Paths = property(GetPaths,doc="See `GetPaths`") 
+    Wildcard = property(GetWildcard,SetWildcard,doc="See `GetWildcard` and `SetWildcard`") 
 _windows_.FileDialog_swigregister(FileDialog)

 CHOICEDLG_STYLE = _windows_.CHOICEDLG_STYLE
@@ -2670,6 +2702,12 @@ class FontData(_core.Object):
        """
        return _windows_.FontData_SetShowHelp(*args, **kwargs)

+    AllowSymbols = property(GetAllowSymbols,SetAllowSymbols,doc="See `GetAllowSymbols` and `SetAllowSymbols`") 
+    ChosenFont = property(GetChosenFont,SetChosenFont,doc="See `GetChosenFont` and `SetChosenFont`") 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
+    EnableEffects = property(GetEnableEffects,doc="See `GetEnableEffects`") 
+    InitialFont = property(GetInitialFont,SetInitialFont,doc="See `GetInitialFont` and `SetInitialFont`") 
+    ShowHelp = property(GetShowHelp,SetShowHelp,doc="See `GetShowHelp` and `SetShowHelp`") 
 _windows_.FontData_swigregister(FontData)

 class FontDialog(Dialog):
@@ -2702,6 +2740,7 @@ class FontDialog(Dialog):
        """
        return _windows_.FontDialog_GetFontData(*args, **kwargs)

+    FontData = property(GetFontData,doc="See `GetFontData`") 
 _windows_.FontDialog_swigregister(FontDialog)


@@ -2859,6 +2898,10 @@ class FindDialogEvent(_core.CommandEvent):
        """SetReplaceString(self, String str)"""
        return _windows_.FindDialogEvent_SetReplaceString(*args, **kwargs)

+    Dialog = property(GetDialog,doc="See `GetDialog`") 
+    FindString = property(GetFindString,SetFindString,doc="See `GetFindString` and `SetFindString`") 
+    Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
+    ReplaceString = property(GetReplaceString,SetReplaceString,doc="See `GetReplaceString` and `SetReplaceString`") 
 _windows_.FindDialogEvent_swigregister(FindDialogEvent)

 class FindReplaceData(_core.Object):
@@ -2931,6 +2974,9 @@ class FindReplaceData(_core.Object):
        """
        return _windows_.FindReplaceData_SetReplaceString(*args, **kwargs)

+    FindString = property(GetFindString,SetFindString,doc="See `GetFindString` and `SetFindString`") 
+    Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
+    ReplaceString = property(GetReplaceString,SetReplaceString,doc="See `GetReplaceString` and `SetReplaceString`") 
 _windows_.FindReplaceData_swigregister(FindReplaceData)

 class FindReplaceDialog(Dialog):
@@ -2981,6 +3027,7 @@ class FindReplaceDialog(Dialog):
        """
        return _windows_.FindReplaceDialog_SetData(*args, **kwargs)

+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
 _windows_.FindReplaceDialog_swigregister(FindReplaceDialog)

 def PreFindReplaceDialog(*args, **kwargs):
--- a/wxPython/src/mac/aui.py
+++ b/wxPython/src/mac/aui.py
@@ -1346,27 +1346,30 @@ class DockArt(object):
        return _aui.DockArt_SetColor(*args, **kwargs)

    def DrawSash(*args, **kwargs):
-        """DrawSash(self, DC dc, int orientation, Rect rect)"""
+        """DrawSash(self, DC dc, Window window, int orientation, Rect rect)"""
        return _aui.DockArt_DrawSash(*args, **kwargs)

    def DrawBackground(*args, **kwargs):
-        """DrawBackground(self, DC dc, int orientation, Rect rect)"""
+        """DrawBackground(self, DC dc, Window window, int orientation, Rect rect)"""
        return _aui.DockArt_DrawBackground(*args, **kwargs)

    def DrawCaption(*args, **kwargs):
-        """DrawCaption(self, DC dc, String text, Rect rect, PaneInfo pane)"""
+        """DrawCaption(self, DC dc, Window window, String text, Rect rect, PaneInfo pane)"""
        return _aui.DockArt_DrawCaption(*args, **kwargs)

    def DrawGripper(*args, **kwargs):
-        """DrawGripper(self, DC dc, Rect rect, PaneInfo pane)"""
+        """DrawGripper(self, DC dc, Window window, Rect rect, PaneInfo pane)"""
        return _aui.DockArt_DrawGripper(*args, **kwargs)

    def DrawBorder(*args, **kwargs):
-        """DrawBorder(self, DC dc, Rect rect, PaneInfo pane)"""
+        """DrawBorder(self, DC dc, Window window, Rect rect, PaneInfo pane)"""
        return _aui.DockArt_DrawBorder(*args, **kwargs)

    def DrawPaneButton(*args, **kwargs):
-        """DrawPaneButton(self, DC dc, int button, int button_state, Rect rect, PaneInfo pane)"""
+        """
+        DrawPaneButton(self, DC dc, Window window, int button, int button_state, 
+            Rect rect, PaneInfo pane)
+        """
        return _aui.DockArt_DrawPaneButton(*args, **kwargs)

 _aui.DockArt_swigregister(DockArt)
--- a/wxPython/src/mac/aui_wrap.cpp
+++ b/wxPython/src/mac/aui_wrap.cpp
@@ -2910,6 +2910,7 @@ class wxPyDockArt :  public wxDefaultDockArt
    DEC_PYCALLBACK__INTCOLOUR(SetColour);

    virtual void DrawSash(wxDC& dc,
+                          wxWindow* window,
                          int orientation,
                          const wxRect& rect)
    {
@@ -2917,18 +2918,20 @@ class wxPyDockArt :  public wxDefaultDockArt
        wxPyBlock_t blocked = wxPyBeginBlockThreads();
        if ((found = wxPyCBH_findCallback(m_myInst, "DrawSash"))) {
            PyObject* odc = wxPyMake_wxObject(&dc, false);
+            PyObject* owin = wxPyMake_wxObject(window, false);
            PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)",
-                                                         odc, orientation, orect));
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
+                                                         odc, owin, orientation, orect));
            Py_DECREF(odc);
            Py_DECREF(orect);
        }
        wxPyEndBlockThreads(blocked);
        if (! found)
-            wxDefaultDockArt::DrawSash(dc, orientation, rect);
+            wxDefaultDockArt::DrawSash(dc, window, orientation, rect);
    }

    virtual void DrawBackground(wxDC& dc,
+                          wxWindow* window,
                          int orientation,
                          const wxRect& rect)
    {
@@ -2936,18 +2939,20 @@ class wxPyDockArt :  public wxDefaultDockArt
        wxPyBlock_t blocked = wxPyBeginBlockThreads();
        if ((found = wxPyCBH_findCallback(m_myInst, "DrawBackground"))) {
            PyObject* odc = wxPyMake_wxObject(&dc, false);
+            PyObject* owin = wxPyMake_wxObject(window, false);
            PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiO)",
-                                                         odc, orientation, orect));
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiO)",
+                                                         odc, owin, orientation, orect));
            Py_DECREF(odc);
            Py_DECREF(orect);
        }
        wxPyEndBlockThreads(blocked);
        if (! found)
-            wxDefaultDockArt::DrawBackground(dc, orientation, rect);
+            wxDefaultDockArt::DrawBackground(dc, window, orientation, rect);
    }

    virtual void DrawCaption(wxDC& dc,
+                          wxWindow* window,
                          const wxString& text,
                          const wxRect& rect,
                          wxPaneInfo& pane)
@@ -2956,11 +2961,12 @@ class wxPyDockArt :  public wxDefaultDockArt
        wxPyBlock_t blocked = wxPyBeginBlockThreads();
        if ((found = wxPyCBH_findCallback(m_myInst, "DrawCaption"))) {
            PyObject* odc = wxPyMake_wxObject(&dc, false);
+            PyObject* owin = wxPyMake_wxObject(window, false);
            PyObject* otext = wx2PyString(text);
            PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
            PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOO)",
-                                                         odc, otext, orect, opane));
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOOO)",
+                                                         odc, owin, otext, orect, opane));
            Py_DECREF(odc);
            Py_DECREF(otext);
            Py_DECREF(orect);
@@ -2968,10 +2974,11 @@ class wxPyDockArt :  public wxDefaultDockArt
       }
        wxPyEndBlockThreads(blocked);
        if (! found)
-            wxDefaultDockArt::DrawCaption(dc, text, rect, pane);
+            wxDefaultDockArt::DrawCaption(dc, window, text, rect, pane);
    }

    virtual void DrawGripper(wxDC& dc,
+                          wxWindow* window,
                          const wxRect& rect,
                          wxPaneInfo& pane)
    {
@@ -2979,19 +2986,21 @@ class wxPyDockArt :  public wxDefaultDockArt
        wxPyBlock_t blocked = wxPyBeginBlockThreads();
        if ((found = wxPyCBH_findCallback(m_myInst, "DrawGripper"))) {
            PyObject* odc = wxPyMake_wxObject(&dc, false);
+            PyObject* owin = wxPyMake_wxObject(window, false);
            PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
            PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOOO)", odc, owin, orect, opane));
            Py_DECREF(odc);
            Py_DECREF(orect);
            Py_DECREF(opane);
        }
        wxPyEndBlockThreads(blocked);
        if (! found)
-            wxDefaultDockArt::DrawGripper(dc, rect, pane);
+            wxDefaultDockArt::DrawGripper(dc, window, rect, pane);
    }

    virtual void DrawBorder(wxDC& dc,
+                          wxWindow* window,
                          const wxRect& rect,
                          wxPaneInfo& pane)
    {
@@ -2999,6 +3008,7 @@ class wxPyDockArt :  public wxDefaultDockArt
        wxPyBlock_t blocked = wxPyBeginBlockThreads();
        if ((found = wxPyCBH_findCallback(m_myInst, "DrawBorder"))) {
            PyObject* odc = wxPyMake_wxObject(&dc, false);
+            PyObject* owin = wxPyMake_wxObject(window, false);
            PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
            PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOO)", odc, orect, opane));
@@ -3008,10 +3018,11 @@ class wxPyDockArt :  public wxDefaultDockArt
       }
        wxPyEndBlockThreads(blocked);
        if (! found)
-            wxDefaultDockArt::DrawBorder(dc, rect, pane);
+            wxDefaultDockArt::DrawBorder(dc, window, rect, pane);
    }

    virtual void DrawPaneButton(wxDC& dc,
+                          wxWindow* window,
                          int button,
                          int button_state,
                          const wxRect& rect,
@@ -3021,10 +3032,11 @@ class wxPyDockArt :  public wxDefaultDockArt
        wxPyBlock_t blocked = wxPyBeginBlockThreads();
        if ((found = wxPyCBH_findCallback(m_myInst, "DrawPaneButton"))) {
            PyObject* odc = wxPyMake_wxObject(&dc, false);
+            PyObject* owin = wxPyMake_wxObject(window, false);
            PyObject* orect = wxPyConstructObject((void*)&rect, wxT("wxRect"), 0);
            PyObject* opane = wxPyConstructObject((void*)&pane, wxT("wxPaneInfo"), 0);
-            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OiIOO)",
-                                                         odc, button, button_state,
+            wxPyCBH_callCallback(m_myInst, Py_BuildValue("(OOiIOO)",
+                                                         odc, owin, button, button_state,
                                                         orect, opane));
            Py_DECREF(odc);
            Py_DECREF(orect);
@@ -3032,7 +3044,7 @@ class wxPyDockArt :  public wxDefaultDockArt
        }
        wxPyEndBlockThreads(blocked);
        if (! found)
-            wxDefaultDockArt::DrawPaneButton(dc, button, button_state, rect, pane);
+            wxDefaultDockArt::DrawPaneButton(dc, window, button, button_state, rect, pane);
    }

    PYPRIVATE;
@@ -10052,24 +10064,28 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawSash(PyObject *SWIGUNUSEDPARM(self), PyOb
  PyObject *resultobj = 0;
  wxDockArt *arg1 = (wxDockArt *) 0 ;
  wxDC *arg2 = 0 ;
-  int arg3 ;
-  wxRect *arg4 = 0 ;
+  wxWindow *arg3 = (wxWindow *) 0 ;
+  int arg4 ;
+  wxRect *arg5 = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  void *argp2 = 0 ;
  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  wxRect temp4 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  wxRect temp5 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
  char *  kwnames[] = {
-    (char *) "self",(char *) "dc",(char *) "orientation",(char *) "rect", NULL 
+    (char *) "self",(char *) "dc",(char *) "window",(char *) "orientation",(char *) "rect", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DockArt_DrawSash",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DockArt_DrawSash",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDockArt, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DockArt_DrawSash" "', expected argument " "1"" of type '" "wxDockArt *""'"); 
@@ -10083,18 +10099,23 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawSash(PyObject *SWIGUNUSEDPARM(self), PyOb
    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawSash" "', expected argument " "2"" of type '" "wxDC &""'"); 
  }
  arg2 = reinterpret_cast< wxDC * >(argp2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DockArt_DrawSash" "', expected argument " "3"" of type '" "int""'");
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DockArt_DrawSash" "', expected argument " "3"" of type '" "wxWindow *""'"); 
  }
-  arg3 = static_cast< int >(val3);
+  arg3 = reinterpret_cast< wxWindow * >(argp3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DockArt_DrawSash" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
  {
-    arg4 = &temp4;
-    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
+    arg5 = &temp5;
+    if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawSash(*arg2,arg3,(wxRect const &)*arg4);
+    (arg1)->DrawSash(*arg2,arg3,arg4,(wxRect const &)*arg5);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -10109,24 +10130,28 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self)
  PyObject *resultobj = 0;
  wxDockArt *arg1 = (wxDockArt *) 0 ;
  wxDC *arg2 = 0 ;
-  int arg3 ;
-  wxRect *arg4 = 0 ;
+  wxWindow *arg3 = (wxWindow *) 0 ;
+  int arg4 ;
+  wxRect *arg5 = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  void *argp2 = 0 ;
  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  wxRect temp4 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  int val4 ;
+  int ecode4 = 0 ;
+  wxRect temp5 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
  char *  kwnames[] = {
-    (char *) "self",(char *) "dc",(char *) "orientation",(char *) "rect", NULL 
+    (char *) "self",(char *) "dc",(char *) "window",(char *) "orientation",(char *) "rect", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DockArt_DrawBackground",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DockArt_DrawBackground",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDockArt, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DockArt_DrawBackground" "', expected argument " "1"" of type '" "wxDockArt *""'"); 
@@ -10140,18 +10165,23 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawBackground(PyObject *SWIGUNUSEDPARM(self)
    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawBackground" "', expected argument " "2"" of type '" "wxDC &""'"); 
  }
  arg2 = reinterpret_cast< wxDC * >(argp2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DockArt_DrawBackground" "', expected argument " "3"" of type '" "int""'");
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DockArt_DrawBackground" "', expected argument " "3"" of type '" "wxWindow *""'"); 
  }
-  arg3 = static_cast< int >(val3);
+  arg3 = reinterpret_cast< wxWindow * >(argp3);
+  ecode4 = SWIG_AsVal_int(obj3, &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DockArt_DrawBackground" "', expected argument " "4"" of type '" "int""'");
+  } 
+  arg4 = static_cast< int >(val4);
  {
-    arg4 = &temp4;
-    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
+    arg5 = &temp5;
+    if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawBackground(*arg2,arg3,(wxRect const &)*arg4);
+    (arg1)->DrawBackground(*arg2,arg3,arg4,(wxRect const &)*arg5);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -10166,27 +10196,31 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawCaption(PyObject *SWIGUNUSEDPARM(self), P
  PyObject *resultobj = 0;
  wxDockArt *arg1 = (wxDockArt *) 0 ;
  wxDC *arg2 = 0 ;
-  wxString *arg3 = 0 ;
-  wxRect *arg4 = 0 ;
-  wxPaneInfo *arg5 = 0 ;
+  wxWindow *arg3 = (wxWindow *) 0 ;
+  wxString *arg4 = 0 ;
+  wxRect *arg5 = 0 ;
+  wxPaneInfo *arg6 = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  void *argp2 = 0 ;
  int res2 = 0 ;
-  bool temp3 = false ;
-  wxRect temp4 ;
-  void *argp5 = 0 ;
-  int res5 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  bool temp4 = false ;
+  wxRect temp5 ;
+  void *argp6 = 0 ;
+  int res6 = 0 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
  PyObject * obj3 = 0 ;
  PyObject * obj4 = 0 ;
+  PyObject * obj5 = 0 ;
  char *  kwnames[] = {
-    (char *) "self",(char *) "dc",(char *) "text",(char *) "rect",(char *) "pane", NULL 
+    (char *) "self",(char *) "dc",(char *) "window",(char *) "text",(char *) "rect",(char *) "pane", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DockArt_DrawCaption",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DockArt_DrawCaption",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDockArt, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DockArt_DrawCaption" "', expected argument " "1"" of type '" "wxDockArt *""'"); 
@@ -10200,39 +10234,44 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawCaption(PyObject *SWIGUNUSEDPARM(self), P
    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawCaption" "', expected argument " "2"" of type '" "wxDC &""'"); 
  }
  arg2 = reinterpret_cast< wxDC * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DockArt_DrawCaption" "', expected argument " "3"" of type '" "wxWindow *""'"); 
+  }
+  arg3 = reinterpret_cast< wxWindow * >(argp3);
  {
-    arg3 = wxString_in_helper(obj2);
-    if (arg3 == NULL) SWIG_fail;
-    temp3 = true;
+    arg4 = wxString_in_helper(obj3);
+    if (arg4 == NULL) SWIG_fail;
+    temp4 = true;
  }
  {
-    arg4 = &temp4;
-    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
+    arg5 = &temp5;
+    if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
  }
-  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxPaneInfo,  0 );
-  if (!SWIG_IsOK(res5)) {
-    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "DockArt_DrawCaption" "', expected argument " "5"" of type '" "wxPaneInfo &""'"); 
+  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_wxPaneInfo,  0 );
+  if (!SWIG_IsOK(res6)) {
+    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "DockArt_DrawCaption" "', expected argument " "6"" of type '" "wxPaneInfo &""'"); 
  }
-  if (!argp5) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawCaption" "', expected argument " "5"" of type '" "wxPaneInfo &""'"); 
+  if (!argp6) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawCaption" "', expected argument " "6"" of type '" "wxPaneInfo &""'"); 
  }
-  arg5 = reinterpret_cast< wxPaneInfo * >(argp5);
+  arg6 = reinterpret_cast< wxPaneInfo * >(argp6);
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawCaption(*arg2,(wxString const &)*arg3,(wxRect const &)*arg4,*arg5);
+    (arg1)->DrawCaption(*arg2,arg3,(wxString const &)*arg4,(wxRect const &)*arg5,*arg6);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
  resultobj = SWIG_Py_Void();
  {
-    if (temp3)
-    delete arg3;
+    if (temp4)
+    delete arg4;
  }
  return resultobj;
 fail:
  {
-    if (temp3)
-    delete arg3;
+    if (temp4)
+    delete arg4;
  }
  return NULL;
 }
@@ -10242,24 +10281,28 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawGripper(PyObject *SWIGUNUSEDPARM(self), P
  PyObject *resultobj = 0;
  wxDockArt *arg1 = (wxDockArt *) 0 ;
  wxDC *arg2 = 0 ;
-  wxRect *arg3 = 0 ;
-  wxPaneInfo *arg4 = 0 ;
+  wxWindow *arg3 = (wxWindow *) 0 ;
+  wxRect *arg4 = 0 ;
+  wxPaneInfo *arg5 = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  void *argp2 = 0 ;
  int res2 = 0 ;
-  wxRect temp3 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxRect temp4 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
  char *  kwnames[] = {
-    (char *) "self",(char *) "dc",(char *) "rect",(char *) "pane", NULL 
+    (char *) "self",(char *) "dc",(char *) "window",(char *) "rect",(char *) "pane", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DockArt_DrawGripper",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DockArt_DrawGripper",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDockArt, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DockArt_DrawGripper" "', expected argument " "1"" of type '" "wxDockArt *""'"); 
@@ -10273,21 +10316,26 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawGripper(PyObject *SWIGUNUSEDPARM(self), P
    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawGripper" "', expected argument " "2"" of type '" "wxDC &""'"); 
  }
  arg2 = reinterpret_cast< wxDC * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DockArt_DrawGripper" "', expected argument " "3"" of type '" "wxWindow *""'"); 
+  }
+  arg3 = reinterpret_cast< wxWindow * >(argp3);
  {
-    arg3 = &temp3;
-    if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
+    arg4 = &temp4;
+    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
  }
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxPaneInfo,  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DockArt_DrawGripper" "', expected argument " "4"" of type '" "wxPaneInfo &""'"); 
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxPaneInfo,  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "DockArt_DrawGripper" "', expected argument " "5"" of type '" "wxPaneInfo &""'"); 
  }
-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawGripper" "', expected argument " "4"" of type '" "wxPaneInfo &""'"); 
+  if (!argp5) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawGripper" "', expected argument " "5"" of type '" "wxPaneInfo &""'"); 
  }
-  arg4 = reinterpret_cast< wxPaneInfo * >(argp4);
+  arg5 = reinterpret_cast< wxPaneInfo * >(argp5);
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawGripper(*arg2,(wxRect const &)*arg3,*arg4);
+    (arg1)->DrawGripper(*arg2,arg3,(wxRect const &)*arg4,*arg5);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -10302,24 +10350,28 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawBorder(PyObject *SWIGUNUSEDPARM(self), Py
  PyObject *resultobj = 0;
  wxDockArt *arg1 = (wxDockArt *) 0 ;
  wxDC *arg2 = 0 ;
-  wxRect *arg3 = 0 ;
-  wxPaneInfo *arg4 = 0 ;
+  wxWindow *arg3 = (wxWindow *) 0 ;
+  wxRect *arg4 = 0 ;
+  wxPaneInfo *arg5 = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  void *argp2 = 0 ;
  int res2 = 0 ;
-  wxRect temp3 ;
-  void *argp4 = 0 ;
-  int res4 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  wxRect temp4 ;
+  void *argp5 = 0 ;
+  int res5 = 0 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
  PyObject * obj3 = 0 ;
+  PyObject * obj4 = 0 ;
  char *  kwnames[] = {
-    (char *) "self",(char *) "dc",(char *) "rect",(char *) "pane", NULL 
+    (char *) "self",(char *) "dc",(char *) "window",(char *) "rect",(char *) "pane", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:DockArt_DrawBorder",kwnames,&obj0,&obj1,&obj2,&obj3)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOO:DockArt_DrawBorder",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDockArt, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DockArt_DrawBorder" "', expected argument " "1"" of type '" "wxDockArt *""'"); 
@@ -10333,21 +10385,26 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawBorder(PyObject *SWIGUNUSEDPARM(self), Py
    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawBorder" "', expected argument " "2"" of type '" "wxDC &""'"); 
  }
  arg2 = reinterpret_cast< wxDC * >(argp2);
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DockArt_DrawBorder" "', expected argument " "3"" of type '" "wxWindow *""'"); 
+  }
+  arg3 = reinterpret_cast< wxWindow * >(argp3);
  {
-    arg3 = &temp3;
-    if ( ! wxRect_helper(obj2, &arg3)) SWIG_fail;
+    arg4 = &temp4;
+    if ( ! wxRect_helper(obj3, &arg4)) SWIG_fail;
  }
-  res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_wxPaneInfo,  0 );
-  if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "DockArt_DrawBorder" "', expected argument " "4"" of type '" "wxPaneInfo &""'"); 
+  res5 = SWIG_ConvertPtr(obj4, &argp5, SWIGTYPE_p_wxPaneInfo,  0 );
+  if (!SWIG_IsOK(res5)) {
+    SWIG_exception_fail(SWIG_ArgError(res5), "in method '" "DockArt_DrawBorder" "', expected argument " "5"" of type '" "wxPaneInfo &""'"); 
  }
-  if (!argp4) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawBorder" "', expected argument " "4"" of type '" "wxPaneInfo &""'"); 
+  if (!argp5) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawBorder" "', expected argument " "5"" of type '" "wxPaneInfo &""'"); 
  }
-  arg4 = reinterpret_cast< wxPaneInfo * >(argp4);
+  arg5 = reinterpret_cast< wxPaneInfo * >(argp5);
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawBorder(*arg2,(wxRect const &)*arg3,*arg4);
+    (arg1)->DrawBorder(*arg2,arg3,(wxRect const &)*arg4,*arg5);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -10362,32 +10419,36 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawPaneButton(PyObject *SWIGUNUSEDPARM(self)
  PyObject *resultobj = 0;
  wxDockArt *arg1 = (wxDockArt *) 0 ;
  wxDC *arg2 = 0 ;
-  int arg3 ;
+  wxWindow *arg3 = (wxWindow *) 0 ;
  int arg4 ;
-  wxRect *arg5 = 0 ;
-  wxPaneInfo *arg6 = 0 ;
+  int arg5 ;
+  wxRect *arg6 = 0 ;
+  wxPaneInfo *arg7 = 0 ;
  void *argp1 = 0 ;
  int res1 = 0 ;
  void *argp2 = 0 ;
  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
  int val4 ;
  int ecode4 = 0 ;
-  wxRect temp5 ;
-  void *argp6 = 0 ;
-  int res6 = 0 ;
+  int val5 ;
+  int ecode5 = 0 ;
+  wxRect temp6 ;
+  void *argp7 = 0 ;
+  int res7 = 0 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
  PyObject * obj3 = 0 ;
  PyObject * obj4 = 0 ;
  PyObject * obj5 = 0 ;
+  PyObject * obj6 = 0 ;
  char *  kwnames[] = {
-    (char *) "self",(char *) "dc",(char *) "button",(char *) "button_state",(char *) "rect",(char *) "pane", NULL 
+    (char *) "self",(char *) "dc",(char *) "window",(char *) "button",(char *) "button_state",(char *) "rect",(char *) "pane", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOO:DockArt_DrawPaneButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOOOOO:DockArt_DrawPaneButton",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxDockArt, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DockArt_DrawPaneButton" "', expected argument " "1"" of type '" "wxDockArt *""'"); 
@@ -10401,31 +10462,36 @@ SWIGINTERN PyObject *_wrap_DockArt_DrawPaneButton(PyObject *SWIGUNUSEDPARM(self)
    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawPaneButton" "', expected argument " "2"" of type '" "wxDC &""'"); 
  }
  arg2 = reinterpret_cast< wxDC * >(argp2);
-  ecode3 = SWIG_AsVal_int(obj2, &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "DockArt_DrawPaneButton" "', expected argument " "3"" of type '" "int""'");
+  res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_wxWindow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "DockArt_DrawPaneButton" "', expected argument " "3"" of type '" "wxWindow *""'"); 
  }
-  arg3 = static_cast< int >(val3);
+  arg3 = reinterpret_cast< wxWindow * >(argp3);
  ecode4 = SWIG_AsVal_int(obj3, &val4);
  if (!SWIG_IsOK(ecode4)) {
    SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "DockArt_DrawPaneButton" "', expected argument " "4"" of type '" "int""'");
  } 
  arg4 = static_cast< int >(val4);
+  ecode5 = SWIG_AsVal_int(obj4, &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), "in method '" "DockArt_DrawPaneButton" "', expected argument " "5"" of type '" "int""'");
+  } 
+  arg5 = static_cast< int >(val5);
  {
-    arg5 = &temp5;
-    if ( ! wxRect_helper(obj4, &arg5)) SWIG_fail;
+    arg6 = &temp6;
+    if ( ! wxRect_helper(obj5, &arg6)) SWIG_fail;
  }
-  res6 = SWIG_ConvertPtr(obj5, &argp6, SWIGTYPE_p_wxPaneInfo,  0 );
-  if (!SWIG_IsOK(res6)) {
-    SWIG_exception_fail(SWIG_ArgError(res6), "in method '" "DockArt_DrawPaneButton" "', expected argument " "6"" of type '" "wxPaneInfo &""'"); 
+  res7 = SWIG_ConvertPtr(obj6, &argp7, SWIGTYPE_p_wxPaneInfo,  0 );
+  if (!SWIG_IsOK(res7)) {
+    SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "DockArt_DrawPaneButton" "', expected argument " "7"" of type '" "wxPaneInfo &""'"); 
  }
-  if (!argp6) {
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawPaneButton" "', expected argument " "6"" of type '" "wxPaneInfo &""'"); 
+  if (!argp7) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "DockArt_DrawPaneButton" "', expected argument " "7"" of type '" "wxPaneInfo &""'"); 
  }
-  arg6 = reinterpret_cast< wxPaneInfo * >(argp6);
+  arg7 = reinterpret_cast< wxPaneInfo * >(argp7);
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->DrawPaneButton(*arg2,arg3,arg4,(wxRect const &)*arg5,*arg6);
+    (arg1)->DrawPaneButton(*arg2,arg3,arg4,arg5,(wxRect const &)*arg6,*arg7);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }