reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/src/gtk/_core.py

@@ -10984,8 +10984,8 @@ class Sizer(Object):
     wx.Sizer is the abstract base class used for laying out subwindows in
     a window.  You cannot use wx.Sizer directly; instead, you will have to
     use one of the sizer classes derived from it such as `wx.BoxSizer`,
-    `wx.StaticBoxSizer`, `wx.NotebookSizer`, `wx.GridSizer`,  `wx.FlexGridSizer`
+    `wx.StaticBoxSizer`, `wx.GridSizer`, `wx.FlexGridSizer` and
-    and `wx.GridBagSizer`.
+    `wx.GridBagSizer`.
 
     The concept implemented by sizers in wxWidgets is closely related to
     layout tools in other GUI toolkits, such as Java's AWT, the GTK

wxPython/src/gtk/_gdi.py

@@ -4981,7 +4981,7 @@ class RendererNative(object):
         Return the generic implementation of the renderer. Under some
         platforms, this is the default renderer implementation, others have
         platform-specific default renderer which can be retrieved by calling
-        `GetDefault`.
+        `wx.RendererNative.GetDefault`.
         """
         return _gdi_.RendererNative_GetGeneric(*args, **kwargs)
 
@@ -4991,9 +4991,9 @@ class RendererNative(object):
         GetDefault() -> RendererNative
 
         Return the default (native) implementation for this platform -- this
-        is also the one used by default but this may be changed by calling `Set`
+        is also the one used by default but this may be changed by calling
-        in which case the return value of this method may be different from
+        `wx.RendererNative.Set` in which case the return value of this method
-        the return value of `Get`.
+        may be different from the return value of `wx.RendererNative.Get`.
         """
         return _gdi_.RendererNative_GetDefault(*args, **kwargs)
 
@@ -5034,7 +5034,7 @@ def RendererNative_GetGeneric(*args):
     Return the generic implementation of the renderer. Under some
     platforms, this is the default renderer implementation, others have
     platform-specific default renderer which can be retrieved by calling
-    `GetDefault`.
+    `wx.RendererNative.GetDefault`.
     """
   return _gdi_.RendererNative_GetGeneric(*args)
 
@@ -5043,9 +5043,9 @@ def RendererNative_GetDefault(*args):
     RendererNative_GetDefault() -> RendererNative
 
     Return the default (native) implementation for this platform -- this
-    is also the one used by default but this may be changed by calling `Set`
+    is also the one used by default but this may be changed by calling
-    in which case the return value of this method may be different from
+    `wx.RendererNative.Set` in which case the return value of this method
-    the return value of `Get`.
+    may be different from the return value of `wx.RendererNative.Get`.
     """
   return _gdi_.RendererNative_GetDefault(*args)
 
@@ -5557,8 +5557,10 @@ class PseudoDC(_core.Object):
         font, and the current text foreground and background colours.
 
         The coordinates refer to the top-left corner of the rectangle bounding
-        the string. See `GetTextExtent` for how to get the dimensions of a
+        the string. See `wx.DC.GetTextExtent` for how to get the dimensions of
-        text string, which can be used to position the text more precisely.
+        a text string, which can be used to position the text more precisely,
+        (you will need to use a real DC with GetTextExtent as wx.PseudoDC does
+        not implement it.)
 
         **NOTE**: under wxGTK the current logical function is used by this
         function but it is ignored by wxMSW. Thus, you should avoid using
@@ -5574,8 +5576,10 @@ class PseudoDC(_core.Object):
         font, and the current text foreground and background colours.
 
         The coordinates refer to the top-left corner of the rectangle bounding
-        the string. See `GetTextExtent` for how to get the dimensions of a
+        the string. See `wx.DC.GetTextExtent` for how to get the dimensions of
-        text string, which can be used to position the text more precisely.
+        a text string, which can be used to position the text more precisely,
+        (you will need to use a real DC with GetTextExtent as wx.PseudoDC does
+        not implement it.)
 
         **NOTE**: under wxGTK the current logical function is used by this
         function but it is ignored by wxMSW. Thus, you should avoid using
@@ -5758,9 +5762,8 @@ class PseudoDC(_core.Object):
         SetLogicalFunction(self, int function)
 
         Sets the current logical function for the device context. This
-        determines how a source pixel (from a pen or brush colour, or source
+        determines how a source pixel (from a pen or brush colour, combines
-        device context if using `Blit`) combines with a destination pixel in
+        with a destination pixel in the current device context.
-        the current device context.
 
         The possible values and their meaning in terms of source and
         destination pixel values are as follows:

wxPython/src/gtk/aui.py

@@ -942,7 +942,7 @@ class FrameManager(_core.EvtHandler):
 
     def SetFrame(*args, **kwargs):
         """
-        SetFrame(self, Frame frame)
+        SetFrame(self, Window frame)
 
         SetFrame is called to specify the frame which is to be managed by the
         FrameManager.  It only needs to be called if the Frame was not given
@@ -953,7 +953,7 @@ class FrameManager(_core.EvtHandler):
 
     def GetFrame(*args, **kwargs):
         """
-        GetFrame(self) -> Frame
+        GetFrame(self) -> Window
 
         GetFrame returns the frame currently being managed by the
         FrameManager.

wxPython/src/gtk/aui_wrap.cpp

@@ -6722,7 +6722,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FrameManager_SetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxFrameManager *arg1 = (wxFrameManager *) 0 ;
-  wxFrame *arg2 = (wxFrame *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6739,11 +6739,11 @@ SWIGINTERN PyObject *_wrap_FrameManager_SetFrame(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManager_SetFrame" "', expected argument " "1"" of type '" "wxFrameManager *""'"); 
   }
   arg1 = reinterpret_cast< wxFrameManager * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFrame, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_SetFrame" "', expected argument " "2"" of type '" "wxFrame *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_SetFrame" "', expected argument " "2"" of type '" "wxWindow *""'"); 
   }
-  arg2 = reinterpret_cast< wxFrame * >(argp2);
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetFrame(arg2);
@@ -6760,7 +6760,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FrameManager_GetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxFrameManager *arg1 = (wxFrameManager *) 0 ;
-  wxFrame *result = 0 ;
+  wxWindow *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -6774,7 +6774,7 @@ SWIGINTERN PyObject *_wrap_FrameManager_GetFrame(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< wxFrameManager * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxFrame *)((wxFrameManager const *)arg1)->GetFrame();
+    result = (wxWindow *)((wxFrameManager const *)arg1)->GetFrame();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

wxPython/src/gtk/richtext.py

@@ -675,7 +675,7 @@ class RichTextCtrl(_windows.ScrolledWindow):
         SaveFile(self, String file=EmptyString, int type=RICHTEXT_TYPE_ANY) -> bool
 
         Save the contents of the document to the given filename, or if the
-        empty string is passed then to the filename set with `SetFileName`.
+        empty string is passed then to the filename set with `SetFilename`.
         """
         return _richtext.RichTextCtrl_SaveFile(*args, **kwargs)
 

wxPython/src/mac/_core.py

@@ -10984,8 +10984,8 @@ class Sizer(Object):
     wx.Sizer is the abstract base class used for laying out subwindows in
     a window.  You cannot use wx.Sizer directly; instead, you will have to
     use one of the sizer classes derived from it such as `wx.BoxSizer`,
-    `wx.StaticBoxSizer`, `wx.NotebookSizer`, `wx.GridSizer`,  `wx.FlexGridSizer`
+    `wx.StaticBoxSizer`, `wx.GridSizer`, `wx.FlexGridSizer` and
-    and `wx.GridBagSizer`.
+    `wx.GridBagSizer`.
 
     The concept implemented by sizers in wxWidgets is closely related to
     layout tools in other GUI toolkits, such as Java's AWT, the GTK

wxPython/src/mac/_gdi.py

@@ -5008,7 +5008,7 @@ class RendererNative(object):
         Return the generic implementation of the renderer. Under some
         platforms, this is the default renderer implementation, others have
         platform-specific default renderer which can be retrieved by calling
-        `GetDefault`.
+        `wx.RendererNative.GetDefault`.
         """
         return _gdi_.RendererNative_GetGeneric(*args, **kwargs)
 
@@ -5018,9 +5018,9 @@ class RendererNative(object):
         GetDefault() -> RendererNative
 
         Return the default (native) implementation for this platform -- this
-        is also the one used by default but this may be changed by calling `Set`
+        is also the one used by default but this may be changed by calling
-        in which case the return value of this method may be different from
+        `wx.RendererNative.Set` in which case the return value of this method
-        the return value of `Get`.
+        may be different from the return value of `wx.RendererNative.Get`.
         """
         return _gdi_.RendererNative_GetDefault(*args, **kwargs)
 
@@ -5061,7 +5061,7 @@ def RendererNative_GetGeneric(*args):
     Return the generic implementation of the renderer. Under some
     platforms, this is the default renderer implementation, others have
     platform-specific default renderer which can be retrieved by calling
-    `GetDefault`.
+    `wx.RendererNative.GetDefault`.
     """
   return _gdi_.RendererNative_GetGeneric(*args)
 
@@ -5070,9 +5070,9 @@ def RendererNative_GetDefault(*args):
     RendererNative_GetDefault() -> RendererNative
 
     Return the default (native) implementation for this platform -- this
-    is also the one used by default but this may be changed by calling `Set`
+    is also the one used by default but this may be changed by calling
-    in which case the return value of this method may be different from
+    `wx.RendererNative.Set` in which case the return value of this method
-    the return value of `Get`.
+    may be different from the return value of `wx.RendererNative.Get`.
     """
   return _gdi_.RendererNative_GetDefault(*args)
 
@@ -5584,8 +5584,10 @@ class PseudoDC(_core.Object):
         font, and the current text foreground and background colours.
 
         The coordinates refer to the top-left corner of the rectangle bounding
-        the string. See `GetTextExtent` for how to get the dimensions of a
+        the string. See `wx.DC.GetTextExtent` for how to get the dimensions of
-        text string, which can be used to position the text more precisely.
+        a text string, which can be used to position the text more precisely,
+        (you will need to use a real DC with GetTextExtent as wx.PseudoDC does
+        not implement it.)
 
         **NOTE**: under wxGTK the current logical function is used by this
         function but it is ignored by wxMSW. Thus, you should avoid using
@@ -5601,8 +5603,10 @@ class PseudoDC(_core.Object):
         font, and the current text foreground and background colours.
 
         The coordinates refer to the top-left corner of the rectangle bounding
-        the string. See `GetTextExtent` for how to get the dimensions of a
+        the string. See `wx.DC.GetTextExtent` for how to get the dimensions of
-        text string, which can be used to position the text more precisely.
+        a text string, which can be used to position the text more precisely,
+        (you will need to use a real DC with GetTextExtent as wx.PseudoDC does
+        not implement it.)
 
         **NOTE**: under wxGTK the current logical function is used by this
         function but it is ignored by wxMSW. Thus, you should avoid using
@@ -5785,9 +5789,8 @@ class PseudoDC(_core.Object):
         SetLogicalFunction(self, int function)
 
         Sets the current logical function for the device context. This
-        determines how a source pixel (from a pen or brush colour, or source
+        determines how a source pixel (from a pen or brush colour, combines
-        device context if using `Blit`) combines with a destination pixel in
+        with a destination pixel in the current device context.
-        the current device context.
 
         The possible values and their meaning in terms of source and
         destination pixel values are as follows:

wxPython/src/mac/aui.py

@@ -942,7 +942,7 @@ class FrameManager(_core.EvtHandler):
 
     def SetFrame(*args, **kwargs):
         """
-        SetFrame(self, Frame frame)
+        SetFrame(self, Window frame)
 
         SetFrame is called to specify the frame which is to be managed by the
         FrameManager.  It only needs to be called if the Frame was not given
@@ -953,7 +953,7 @@ class FrameManager(_core.EvtHandler):
 
     def GetFrame(*args, **kwargs):
         """
-        GetFrame(self) -> Frame
+        GetFrame(self) -> Window
 
         GetFrame returns the frame currently being managed by the
         FrameManager.
@@ -1079,6 +1079,14 @@ class FrameManager(_core.EvtHandler):
         """
         return _aui.FrameManager_Update(*args, **kwargs)
 
+    def OnRender(*args, **kwargs):
+        """OnRender(self, FrameManagerEvent evt)"""
+        return _aui.FrameManager_OnRender(*args, **kwargs)
+
+    def OnPaneButton(*args, **kwargs):
+        """OnPaneButton(self, FrameManagerEvent evt)"""
+        return _aui.FrameManager_OnPaneButton(*args, **kwargs)
+
     def GetPane(self, item):
         """
         GetPane(self, window_or_info item) -> PaneInfo
@@ -1146,6 +1154,10 @@ class FrameManagerEvent(_core.Event):
         """SetButton(self, int b)"""
         return _aui.FrameManagerEvent_SetButton(*args, **kwargs)
 
+    def SetDC(*args, **kwargs):
+        """SetDC(self, DC pdc)"""
+        return _aui.FrameManagerEvent_SetDC(*args, **kwargs)
+
     def GetPane(*args, **kwargs):
         """GetPane(self) -> PaneInfo"""
         return _aui.FrameManagerEvent_GetPane(*args, **kwargs)
@@ -1154,6 +1166,10 @@ class FrameManagerEvent(_core.Event):
         """GetButton(self) -> int"""
         return _aui.FrameManagerEvent_GetButton(*args, **kwargs)
 
+    def GetDC(*args, **kwargs):
+        """GetDC(self) -> DC"""
+        return _aui.FrameManagerEvent_GetDC(*args, **kwargs)
+
     def Veto(*args, **kwargs):
         """Veto(self, bool veto=True)"""
         return _aui.FrameManagerEvent_Veto(*args, **kwargs)
@@ -1174,6 +1190,7 @@ class FrameManagerEvent(_core.Event):
     button = property(_aui.FrameManagerEvent_button_get, _aui.FrameManagerEvent_button_set)
     veto_flag = property(_aui.FrameManagerEvent_veto_flag_get, _aui.FrameManagerEvent_veto_flag_set)
     canveto_flag = property(_aui.FrameManagerEvent_canveto_flag_get, _aui.FrameManagerEvent_canveto_flag_set)
+    dc = property(_aui.FrameManagerEvent_dc_get, _aui.FrameManagerEvent_dc_set)
 _aui.FrameManagerEvent_swigregister(FrameManagerEvent)
 
 class DockInfo(object):
@@ -1241,8 +1258,10 @@ _aui.PaneButton_swigregister(PaneButton)
 
 wxEVT_AUI_PANEBUTTON = _aui.wxEVT_AUI_PANEBUTTON
 wxEVT_AUI_PANECLOSE = _aui.wxEVT_AUI_PANECLOSE
+wxEVT_AUI_RENDER = _aui.wxEVT_AUI_RENDER
 EVT_AUI_PANEBUTTON = wx.PyEventBinder( wxEVT_AUI_PANEBUTTON )
 EVT_AUI_PANECLOSE = wx.PyEventBinder( wxEVT_AUI_PANECLOSE )
+EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER )
 
 class DockArt(object):
     """

wxPython/src/mac/aui_wrap.cpp

@@ -6722,7 +6722,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FrameManager_SetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxFrameManager *arg1 = (wxFrameManager *) 0 ;
-  wxFrame *arg2 = (wxFrame *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6739,11 +6739,11 @@ SWIGINTERN PyObject *_wrap_FrameManager_SetFrame(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManager_SetFrame" "', expected argument " "1"" of type '" "wxFrameManager *""'"); 
   }
   arg1 = reinterpret_cast< wxFrameManager * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFrame, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_SetFrame" "', expected argument " "2"" of type '" "wxFrame *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_SetFrame" "', expected argument " "2"" of type '" "wxWindow *""'"); 
   }
-  arg2 = reinterpret_cast< wxFrame * >(argp2);
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetFrame(arg2);
@@ -6760,7 +6760,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FrameManager_GetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxFrameManager *arg1 = (wxFrameManager *) 0 ;
-  wxFrame *result = 0 ;
+  wxWindow *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -6774,7 +6774,7 @@ SWIGINTERN PyObject *_wrap_FrameManager_GetFrame(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< wxFrameManager * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxFrame *)((wxFrameManager const *)arg1)->GetFrame();
+    result = (wxWindow *)((wxFrameManager const *)arg1)->GetFrame();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }
@@ -7328,6 +7328,88 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_FrameManager_OnRender(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFrameManager *arg1 = (wxFrameManager *) 0 ;
+  wxFrameManagerEvent *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "evt", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FrameManager_OnRender",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFrameManager, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManager_OnRender" "', expected argument " "1"" of type '" "wxFrameManager *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFrameManager * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFrameManagerEvent,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_OnRender" "', expected argument " "2"" of type '" "wxFrameManagerEvent &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FrameManager_OnRender" "', expected argument " "2"" of type '" "wxFrameManagerEvent &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFrameManagerEvent * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->OnRender(*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FrameManager_OnPaneButton(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFrameManager *arg1 = (wxFrameManager *) 0 ;
+  wxFrameManagerEvent *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "evt", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FrameManager_OnPaneButton",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFrameManager, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManager_OnPaneButton" "', expected argument " "1"" of type '" "wxFrameManager *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFrameManager * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_wxFrameManagerEvent,  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_OnPaneButton" "', expected argument " "2"" of type '" "wxFrameManagerEvent &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "FrameManager_OnPaneButton" "', expected argument " "2"" of type '" "wxFrameManagerEvent &""'"); 
+  }
+  arg2 = reinterpret_cast< wxFrameManagerEvent * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->OnPaneButton(*arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FrameManager_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -7475,6 +7557,44 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_FrameManagerEvent_SetDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxFrameManagerEvent *arg1 = (wxFrameManagerEvent *) 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "pdc", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FrameManagerEvent_SetDC",kwnames,&obj0,&obj1)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFrameManagerEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManagerEvent_SetDC" "', expected argument " "1"" of type '" "wxFrameManagerEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFrameManagerEvent * >(argp1);
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxDC, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManagerEvent_SetDC" "', expected argument " "2"" of type '" "wxDC *""'"); 
+  }
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    (arg1)->SetDC(arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_FrameManagerEvent_GetPane(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxFrameManagerEvent *arg1 = (wxFrameManagerEvent *) 0 ;
@@ -7531,6 +7651,36 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_FrameManagerEvent_GetDC(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFrameManagerEvent *arg1 = (wxFrameManagerEvent *) 0 ;
+  wxDC *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_wxFrameManagerEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManagerEvent_GetDC" "', expected argument " "1"" of type '" "wxFrameManagerEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFrameManagerEvent * >(argp1);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (wxDC *)(arg1)->GetDC();
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_FrameManagerEvent_Veto(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxFrameManagerEvent *arg1 = (wxFrameManagerEvent *) 0 ;
@@ -7885,6 +8035,61 @@ fail:
 }
 
 
+SWIGINTERN PyObject *_wrap_FrameManagerEvent_dc_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFrameManagerEvent *arg1 = (wxFrameManagerEvent *) 0 ;
+  wxDC *arg2 = (wxDC *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  if (!SWIG_Python_UnpackTuple(args,"FrameManagerEvent_dc_set",2,2,swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_wxFrameManagerEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManagerEvent_dc_set" "', expected argument " "1"" of type '" "wxFrameManagerEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFrameManagerEvent * >(argp1);
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_wxDC, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManagerEvent_dc_set" "', expected argument " "2"" of type '" "wxDC *""'"); 
+  }
+  arg2 = reinterpret_cast< wxDC * >(argp2);
+  if (arg1) (arg1)->dc = arg2;
+  
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_FrameManagerEvent_dc_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *resultobj = 0;
+  wxFrameManagerEvent *arg1 = (wxFrameManagerEvent *) 0 ;
+  wxDC *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_wxFrameManagerEvent, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManagerEvent_dc_get" "', expected argument " "1"" of type '" "wxFrameManagerEvent *""'"); 
+  }
+  arg1 = reinterpret_cast< wxFrameManagerEvent * >(argp1);
+  result = (wxDC *) ((arg1)->dc);
+  {
+    resultobj = wxPyMake_wxObject(result, (bool)0); 
+  }
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FrameManagerEvent_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj;
   if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -10126,14 +10331,18 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FrameManager_SavePerspective", (PyCFunction)_wrap_FrameManager_SavePerspective, METH_O, NULL},
 	 { (char *)"FrameManager_LoadPerspective", (PyCFunction) _wrap_FrameManager_LoadPerspective, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FrameManager_Update", (PyCFunction)_wrap_FrameManager_Update, METH_O, NULL},
+	 { (char *)"FrameManager_OnRender", (PyCFunction) _wrap_FrameManager_OnRender, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"FrameManager_OnPaneButton", (PyCFunction) _wrap_FrameManager_OnPaneButton, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FrameManager_swigregister", FrameManager_swigregister, METH_VARARGS, NULL},
 	 { (char *)"FrameManager_swiginit", FrameManager_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_FrameManagerEvent", (PyCFunction) _wrap_new_FrameManagerEvent, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FrameManagerEvent_Clone", (PyCFunction)_wrap_FrameManagerEvent_Clone, METH_O, NULL},
 	 { (char *)"FrameManagerEvent_SetPane", (PyCFunction) _wrap_FrameManagerEvent_SetPane, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FrameManagerEvent_SetButton", (PyCFunction) _wrap_FrameManagerEvent_SetButton, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"FrameManagerEvent_SetDC", (PyCFunction) _wrap_FrameManagerEvent_SetDC, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FrameManagerEvent_GetPane", (PyCFunction)_wrap_FrameManagerEvent_GetPane, METH_O, NULL},
 	 { (char *)"FrameManagerEvent_GetButton", (PyCFunction)_wrap_FrameManagerEvent_GetButton, METH_O, NULL},
+	 { (char *)"FrameManagerEvent_GetDC", (PyCFunction)_wrap_FrameManagerEvent_GetDC, METH_O, NULL},
 	 { (char *)"FrameManagerEvent_Veto", (PyCFunction) _wrap_FrameManagerEvent_Veto, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FrameManagerEvent_GetVeto", (PyCFunction)_wrap_FrameManagerEvent_GetVeto, METH_O, NULL},
 	 { (char *)"FrameManagerEvent_SetCanVeto", (PyCFunction) _wrap_FrameManagerEvent_SetCanVeto, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -10146,6 +10355,8 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FrameManagerEvent_veto_flag_get", (PyCFunction)_wrap_FrameManagerEvent_veto_flag_get, METH_O, NULL},
 	 { (char *)"FrameManagerEvent_canveto_flag_set", _wrap_FrameManagerEvent_canveto_flag_set, METH_VARARGS, NULL},
 	 { (char *)"FrameManagerEvent_canveto_flag_get", (PyCFunction)_wrap_FrameManagerEvent_canveto_flag_get, METH_O, NULL},
+	 { (char *)"FrameManagerEvent_dc_set", _wrap_FrameManagerEvent_dc_set, METH_VARARGS, NULL},
+	 { (char *)"FrameManagerEvent_dc_get", (PyCFunction)_wrap_FrameManagerEvent_dc_get, METH_O, NULL},
 	 { (char *)"FrameManagerEvent_swigregister", FrameManagerEvent_swigregister, METH_VARARGS, NULL},
 	 { (char *)"FrameManagerEvent_swiginit", FrameManagerEvent_swiginit, METH_VARARGS, NULL},
 	 { (char *)"new_DockInfo", (PyCFunction)_wrap_new_DockInfo, METH_NOARGS, NULL},
@@ -12455,5 +12666,6 @@ SWIGEXPORT void SWIG_init(void) {
   SWIG_Python_SetConstant(d, "DockUIPart_typePaneButton",SWIG_From_int(static_cast< int >(wxDockUIPart::typePaneButton)));
   PyDict_SetItemString(d, "wxEVT_AUI_PANEBUTTON", PyInt_FromLong(wxEVT_AUI_PANEBUTTON));
   PyDict_SetItemString(d, "wxEVT_AUI_PANECLOSE", PyInt_FromLong(wxEVT_AUI_PANECLOSE));
+  PyDict_SetItemString(d, "wxEVT_AUI_RENDER", PyInt_FromLong(wxEVT_AUI_RENDER));
 }
 

wxPython/src/mac/richtext.py

@@ -675,7 +675,7 @@ class RichTextCtrl(_windows.ScrolledWindow):
         SaveFile(self, String file=EmptyString, int type=RICHTEXT_TYPE_ANY) -> bool
 
         Save the contents of the document to the given filename, or if the
-        empty string is passed then to the filename set with `SetFileName`.
+        empty string is passed then to the filename set with `SetFilename`.
         """
         return _richtext.RichTextCtrl_SaveFile(*args, **kwargs)
 

wxPython/src/msw/_core.py

@@ -10988,8 +10988,8 @@ class Sizer(Object):
     wx.Sizer is the abstract base class used for laying out subwindows in
     a window.  You cannot use wx.Sizer directly; instead, you will have to
     use one of the sizer classes derived from it such as `wx.BoxSizer`,
-    `wx.StaticBoxSizer`, `wx.NotebookSizer`, `wx.GridSizer`,  `wx.FlexGridSizer`
+    `wx.StaticBoxSizer`, `wx.GridSizer`, `wx.FlexGridSizer` and
-    and `wx.GridBagSizer`.
+    `wx.GridBagSizer`.
 
     The concept implemented by sizers in wxWidgets is closely related to
     layout tools in other GUI toolkits, such as Java's AWT, the GTK

wxPython/src/msw/_gdi.py

@@ -5104,7 +5104,7 @@ class RendererNative(object):
         Return the generic implementation of the renderer. Under some
         platforms, this is the default renderer implementation, others have
         platform-specific default renderer which can be retrieved by calling
-        `GetDefault`.
+        `wx.RendererNative.GetDefault`.
         """
         return _gdi_.RendererNative_GetGeneric(*args, **kwargs)
 
@@ -5114,9 +5114,9 @@ class RendererNative(object):
         GetDefault() -> RendererNative
 
         Return the default (native) implementation for this platform -- this
-        is also the one used by default but this may be changed by calling `Set`
+        is also the one used by default but this may be changed by calling
-        in which case the return value of this method may be different from
+        `wx.RendererNative.Set` in which case the return value of this method
-        the return value of `Get`.
+        may be different from the return value of `wx.RendererNative.Get`.
         """
         return _gdi_.RendererNative_GetDefault(*args, **kwargs)
 
@@ -5157,7 +5157,7 @@ def RendererNative_GetGeneric(*args):
     Return the generic implementation of the renderer. Under some
     platforms, this is the default renderer implementation, others have
     platform-specific default renderer which can be retrieved by calling
-    `GetDefault`.
+    `wx.RendererNative.GetDefault`.
     """
   return _gdi_.RendererNative_GetGeneric(*args)
 
@@ -5166,9 +5166,9 @@ def RendererNative_GetDefault(*args):
     RendererNative_GetDefault() -> RendererNative
 
     Return the default (native) implementation for this platform -- this
-    is also the one used by default but this may be changed by calling `Set`
+    is also the one used by default but this may be changed by calling
-    in which case the return value of this method may be different from
+    `wx.RendererNative.Set` in which case the return value of this method
-    the return value of `Get`.
+    may be different from the return value of `wx.RendererNative.Get`.
     """
   return _gdi_.RendererNative_GetDefault(*args)
 
@@ -5680,8 +5680,10 @@ class PseudoDC(_core.Object):
         font, and the current text foreground and background colours.
 
         The coordinates refer to the top-left corner of the rectangle bounding
-        the string. See `GetTextExtent` for how to get the dimensions of a
+        the string. See `wx.DC.GetTextExtent` for how to get the dimensions of
-        text string, which can be used to position the text more precisely.
+        a text string, which can be used to position the text more precisely,
+        (you will need to use a real DC with GetTextExtent as wx.PseudoDC does
+        not implement it.)
 
         **NOTE**: under wxGTK the current logical function is used by this
         function but it is ignored by wxMSW. Thus, you should avoid using
@@ -5697,8 +5699,10 @@ class PseudoDC(_core.Object):
         font, and the current text foreground and background colours.
 
         The coordinates refer to the top-left corner of the rectangle bounding
-        the string. See `GetTextExtent` for how to get the dimensions of a
+        the string. See `wx.DC.GetTextExtent` for how to get the dimensions of
-        text string, which can be used to position the text more precisely.
+        a text string, which can be used to position the text more precisely,
+        (you will need to use a real DC with GetTextExtent as wx.PseudoDC does
+        not implement it.)
 
         **NOTE**: under wxGTK the current logical function is used by this
         function but it is ignored by wxMSW. Thus, you should avoid using
@@ -5881,9 +5885,8 @@ class PseudoDC(_core.Object):
         SetLogicalFunction(self, int function)
 
         Sets the current logical function for the device context. This
-        determines how a source pixel (from a pen or brush colour, or source
+        determines how a source pixel (from a pen or brush colour, combines
-        device context if using `Blit`) combines with a destination pixel in
+        with a destination pixel in the current device context.
-        the current device context.
 
         The possible values and their meaning in terms of source and
         destination pixel values are as follows:

wxPython/src/msw/aui.py

@@ -942,7 +942,7 @@ class FrameManager(_core.EvtHandler):
 
     def SetFrame(*args, **kwargs):
         """
-        SetFrame(self, Frame frame)
+        SetFrame(self, Window frame)
 
         SetFrame is called to specify the frame which is to be managed by the
         FrameManager.  It only needs to be called if the Frame was not given
@@ -953,7 +953,7 @@ class FrameManager(_core.EvtHandler):
 
     def GetFrame(*args, **kwargs):
         """
-        GetFrame(self) -> Frame
+        GetFrame(self) -> Window
 
         GetFrame returns the frame currently being managed by the
         FrameManager.

wxPython/src/msw/aui_wrap.cpp

@@ -6722,7 +6722,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FrameManager_SetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
   PyObject *resultobj = 0;
   wxFrameManager *arg1 = (wxFrameManager *) 0 ;
-  wxFrame *arg2 = (wxFrame *) 0 ;
+  wxWindow *arg2 = (wxWindow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -6739,11 +6739,11 @@ SWIGINTERN PyObject *_wrap_FrameManager_SetFrame(PyObject *SWIGUNUSEDPARM(self),
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FrameManager_SetFrame" "', expected argument " "1"" of type '" "wxFrameManager *""'"); 
   }
   arg1 = reinterpret_cast< wxFrameManager * >(argp1);
-  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxFrame, 0 |  0 );
+  res2 = SWIG_ConvertPtr(obj1, &argp2,SWIGTYPE_p_wxWindow, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_SetFrame" "', expected argument " "2"" of type '" "wxFrame *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FrameManager_SetFrame" "', expected argument " "2"" of type '" "wxWindow *""'"); 
   }
-  arg2 = reinterpret_cast< wxFrame * >(argp2);
+  arg2 = reinterpret_cast< wxWindow * >(argp2);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
     (arg1)->SetFrame(arg2);
@@ -6760,7 +6760,7 @@ fail:
 SWIGINTERN PyObject *_wrap_FrameManager_GetFrame(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *resultobj = 0;
   wxFrameManager *arg1 = (wxFrameManager *) 0 ;
-  wxFrame *result = 0 ;
+  wxWindow *result = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -6774,7 +6774,7 @@ SWIGINTERN PyObject *_wrap_FrameManager_GetFrame(PyObject *SWIGUNUSEDPARM(self),
   arg1 = reinterpret_cast< wxFrameManager * >(argp1);
   {
     PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (wxFrame *)((wxFrameManager const *)arg1)->GetFrame();
+    result = (wxWindow *)((wxFrameManager const *)arg1)->GetFrame();
     wxPyEndAllowThreads(__tstate);
     if (PyErr_Occurred()) SWIG_fail;
   }

wxPython/src/msw/richtext.py

@@ -675,7 +675,7 @@ class RichTextCtrl(_windows.ScrolledWindow):
         SaveFile(self, String file=EmptyString, int type=RICHTEXT_TYPE_ANY) -> bool
 
         Save the contents of the document to the given filename, or if the
-        empty string is passed then to the filename set with `SetFileName`.
+        empty string is passed then to the filename set with `SetFilename`.
         """
         return _richtext.RichTextCtrl_SaveFile(*args, **kwargs)