reSWIGged

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39462 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-05-29 21:18:31 +00:00
parent dd74a8f6aa
commit 704eda0cdc
36 changed files with 6681 additions and 2271 deletions
--- a/wxPython/src/msw/_controls.py
+++ b/wxPython/src/msw/_controls.py
@@ -2877,6 +2877,15 @@ class BookCtrlBase(_core.Control):
        """AdvanceSelection(self, bool forward=True)"""
        return _controls_.BookCtrlBase_AdvanceSelection(*args, **kwargs)

+    def HitTest(*args, **kwargs):
+        """
+        HitTest(Point pt) -> (tab, where)
+
+        Returns the page/tab which is hit, and flags indicating where using
+        wx.NB_HITTEST flags.
+        """
+        return _controls_.BookCtrlBase_HitTest(*args, **kwargs)
+
    def GetClassDefaultAttributes(*args, **kwargs):
        """
        GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes
@@ -2992,15 +3001,6 @@ class Notebook(BookCtrlBase):
        """SetTabSize(self, Size sz)"""
        return _controls_.Notebook_SetTabSize(*args, **kwargs)

-    def HitTest(*args, **kwargs):
-        """
-        HitTest(Point pt) -> (tab, where)
-
-        Returns the tab which is hit, and flags indicating where using
-        wx.NB_HITTEST flags.
-        """
-        return _controls_.Notebook_HitTest(*args, **kwargs)
-
    def GetThemeBackgroundColour(*args, **kwargs):
        """GetThemeBackgroundColour(self) -> Colour"""
        return _controls_.Notebook_GetThemeBackgroundColour(*args, **kwargs)
@@ -3355,6 +3355,7 @@ TB_NODIVIDER = _controls_.TB_NODIVIDER
 TB_NOALIGN = _controls_.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
+TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
 class ToolBarToolBase(_core.Object):
    """Proxy of C++ ToolBarToolBase class"""
    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -3915,6 +3916,7 @@ LIST_HITTEST_ONITEMSTATEICON = _controls_.LIST_HITTEST_ONITEMSTATEICON
 LIST_HITTEST_TOLEFT = _controls_.LIST_HITTEST_TOLEFT
 LIST_HITTEST_TORIGHT = _controls_.LIST_HITTEST_TORIGHT
 LIST_HITTEST_ONITEM = _controls_.LIST_HITTEST_ONITEM
+LIST_GETSUBITEMRECT_WHOLEITEM = _controls_.LIST_GETSUBITEMRECT_WHOLEITEM
 LIST_NEXT_ABOVE = _controls_.LIST_NEXT_ABOVE
 LIST_NEXT_ALL = _controls_.LIST_NEXT_ALL
 LIST_NEXT_BELOW = _controls_.LIST_NEXT_BELOW
@@ -4502,6 +4504,16 @@ class ListCtrl(_core.Control):
        """
        return _controls_.ListCtrl_HitTest(*args, **kwargs)

+    def HitTestSubItem(*args, **kwargs):
+        """
+        HitTestSubItem(Point point) -> (item, where, subItem)
+
+        Determines which item (if any) is at the specified point, giving  in
+        the second return value (see wx.LIST_HITTEST flags) and also the subItem, if
+        any.
+        """
+        return _controls_.ListCtrl_HitTestSubItem(*args, **kwargs)
+
    def InsertItem(*args, **kwargs):
        """InsertItem(self, ListItem info) -> long"""
        return _controls_.ListCtrl_InsertItem(*args, **kwargs)
@@ -5380,6 +5392,10 @@ class GenericDirCtrl(_core.Control):
        """ExpandPath(self, String path) -> bool"""
        return _controls_.GenericDirCtrl_ExpandPath(*args, **kwargs)

+    def CollapsePath(*args, **kwargs):
+        """CollapsePath(self, String path) -> bool"""
+        return _controls_.GenericDirCtrl_CollapsePath(*args, **kwargs)
+
    def GetDefaultPath(*args, **kwargs):
        """GetDefaultPath(self) -> String"""
        return _controls_.GenericDirCtrl_GetDefaultPath(*args, **kwargs)
@@ -5708,8 +5724,14 @@ class HelpEvent(_core.CommandEvent):
    """
    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
    __repr__ = _swig_repr
+    Origin_Unknown = _controls_.HelpEvent_Origin_Unknown
+    Origin_Keyboard = _controls_.HelpEvent_Origin_Keyboard
+    Origin_HelpButton = _controls_.HelpEvent_Origin_HelpButton
    def __init__(self, *args, **kwargs): 
-        """__init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition) -> HelpEvent"""
+        """
+        __init__(self, EventType type=wxEVT_NULL, int winid=0, Point pt=DefaultPosition, 
+            int origin=Origin_Unknown) -> HelpEvent
+        """
        _controls_.HelpEvent_swiginit(self,_controls_.new_HelpEvent(*args, **kwargs))
    def GetPosition(*args, **kwargs):
        """
@@ -5761,6 +5783,18 @@ class HelpEvent(_core.CommandEvent):
        """
        return _controls_.HelpEvent_SetTarget(*args, **kwargs)

+    def GetOrigin(*args, **kwargs):
+        """
+        GetOrigin(self) -> int
+
+        Optiononal indication of the source of the event.
+        """
+        return _controls_.HelpEvent_GetOrigin(*args, **kwargs)
+
+    def SetOrigin(*args, **kwargs):
+        """SetOrigin(self, int origin)"""
+        return _controls_.HelpEvent_SetOrigin(*args, **kwargs)
+
 _controls_.HelpEvent_swigregister(HelpEvent)

 class ContextHelp(_core.Object):
@@ -6173,5 +6207,130 @@ def PreDatePickerCtrl(*args, **kwargs):
    val = _controls_.new_PreDatePickerCtrl(*args, **kwargs)
    return val

+HL_CONTEXTMENU = _controls_.HL_CONTEXTMENU
+HL_DEFAULT_STYLE = _controls_.HL_DEFAULT_STYLE
+#---------------------------------------------------------------------------
+
+class HyperlinkCtrl(_core.Control):
+    """
+    A static text control that emulates a hyperlink. The link is displayed
+    in an appropriate text style, derived from the control's normal font.
+    When the mouse rolls over the link, the cursor changes to a hand and
+    the link's color changes to the active color.
+
+    Clicking on the link does not launch a web browser; instead, a
+    wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
+    events.
+
+    """
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, Window parent, int id, String label, String url, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> HyperlinkCtrl
+
+        A static text control that emulates a hyperlink. The link is displayed
+        in an appropriate text style, derived from the control's normal font.
+        When the mouse rolls over the link, the cursor changes to a hand and
+        the link's color changes to the active color.
+
+        Clicking on the link does not launch a web browser; instead, a
+        wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
+        events.
+
+        """
+        _controls_.HyperlinkCtrl_swiginit(self,_controls_.new_HyperlinkCtrl(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id, String label, String url, Point pos=DefaultPosition, 
+            Size size=DefaultSize, 
+            long style=HL_DEFAULT_STYLE, String name=HyperlinkCtrlNameStr) -> bool
+        """
+        return _controls_.HyperlinkCtrl_Create(*args, **kwargs)
+
+    def GetHoverColour(*args, **kwargs):
+        """GetHoverColour(self) -> Colour"""
+        return _controls_.HyperlinkCtrl_GetHoverColour(*args, **kwargs)
+
+    def SetHoverColour(*args, **kwargs):
+        """SetHoverColour(self, Colour colour)"""
+        return _controls_.HyperlinkCtrl_SetHoverColour(*args, **kwargs)
+
+    def GetNormalColour(*args, **kwargs):
+        """GetNormalColour(self) -> Colour"""
+        return _controls_.HyperlinkCtrl_GetNormalColour(*args, **kwargs)
+
+    def SetNormalColour(*args, **kwargs):
+        """SetNormalColour(self, Colour colour)"""
+        return _controls_.HyperlinkCtrl_SetNormalColour(*args, **kwargs)
+
+    def GetVisitedColour(*args, **kwargs):
+        """GetVisitedColour(self) -> Colour"""
+        return _controls_.HyperlinkCtrl_GetVisitedColour(*args, **kwargs)
+
+    def SetVisitedColour(*args, **kwargs):
+        """SetVisitedColour(self, Colour colour)"""
+        return _controls_.HyperlinkCtrl_SetVisitedColour(*args, **kwargs)
+
+    def GetURL(*args, **kwargs):
+        """GetURL(self) -> String"""
+        return _controls_.HyperlinkCtrl_GetURL(*args, **kwargs)
+
+    def SetURL(*args, **kwargs):
+        """SetURL(self, String url)"""
+        return _controls_.HyperlinkCtrl_SetURL(*args, **kwargs)
+
+    def SetVisited(*args, **kwargs):
+        """SetVisited(self, bool visited=True)"""
+        return _controls_.HyperlinkCtrl_SetVisited(*args, **kwargs)
+
+    def GetVisited(*args, **kwargs):
+        """GetVisited(self) -> bool"""
+        return _controls_.HyperlinkCtrl_GetVisited(*args, **kwargs)
+
+_controls_.HyperlinkCtrl_swigregister(HyperlinkCtrl)
+HyperlinkCtrlNameStr = cvar.HyperlinkCtrlNameStr
+
+def PreHyperlinkCtrl(*args, **kwargs):
+    """
+    PreHyperlinkCtrl() -> HyperlinkCtrl
+
+    A static text control that emulates a hyperlink. The link is displayed
+    in an appropriate text style, derived from the control's normal font.
+    When the mouse rolls over the link, the cursor changes to a hand and
+    the link's color changes to the active color.
+
+    Clicking on the link does not launch a web browser; instead, a
+    wx.HyperlinkEvent is fired. Use the wx.EVT_HYPERLINK to catch link
+    events.
+
+    """
+    val = _controls_.new_PreHyperlinkCtrl(*args, **kwargs)
+    return val
+
+wxEVT_COMMAND_HYPERLINK = _controls_.wxEVT_COMMAND_HYPERLINK
+class HyperlinkEvent(_core.CommandEvent):
+    """Proxy of C++ HyperlinkEvent class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """__init__(self, Object generator, int id, String url) -> HyperlinkEvent"""
+        _controls_.HyperlinkEvent_swiginit(self,_controls_.new_HyperlinkEvent(*args, **kwargs))
+    def GetURL(*args, **kwargs):
+        """GetURL(self) -> String"""
+        return _controls_.HyperlinkEvent_GetURL(*args, **kwargs)
+
+    def SetURL(*args, **kwargs):
+        """SetURL(self, String url)"""
+        return _controls_.HyperlinkEvent_SetURL(*args, **kwargs)
+
+_controls_.HyperlinkEvent_swigregister(HyperlinkEvent)
+
+EVT_HYPERLINK = wx.PyEventBinder( wxEVT_COMMAND_HYPERLINK, 1 )
+


--- a/wxPython/src/msw/_controls_wrap.cpp
+++ b/wxPython/src/msw/_controls_wrap.cpp
--- a/wxPython/src/msw/_core.py
+++ b/wxPython/src/msw/_core.py
@@ -271,13 +271,6 @@ ID_ZOOM_OUT = _core_.ID_ZOOM_OUT
 ID_UNDELETE = _core_.ID_UNDELETE
 ID_REVERT_TO_SAVED = _core_.ID_REVERT_TO_SAVED
 ID_HIGHEST = _core_.ID_HIGHEST
-OPEN = _core_.OPEN
-SAVE = _core_.SAVE
-HIDE_READONLY = _core_.HIDE_READONLY
-OVERWRITE_PROMPT = _core_.OVERWRITE_PROMPT
-FILE_MUST_EXIST = _core_.FILE_MUST_EXIST
-MULTIPLE = _core_.MULTIPLE
-CHANGE_DIR = _core_.CHANGE_DIR
 ACCEL_ALT = _core_.ACCEL_ALT
 ACCEL_CTRL = _core_.ACCEL_CTRL
 ACCEL_SHIFT = _core_.ACCEL_SHIFT
@@ -290,9 +283,6 @@ PD_ESTIMATED_TIME = _core_.PD_ESTIMATED_TIME
 PD_REMAINING_TIME = _core_.PD_REMAINING_TIME
 PD_SMOOTH = _core_.PD_SMOOTH
 PD_CAN_SKIP = _core_.PD_CAN_SKIP
-DD_NEW_DIR_BUTTON = _core_.DD_NEW_DIR_BUTTON
-DD_DEFAULT_STYLE = _core_.DD_DEFAULT_STYLE
-DD_CHANGE_DIR = _core_.DD_CHANGE_DIR
 MENU_TEAROFF = _core_.MENU_TEAROFF
 MB_DOCKABLE = _core_.MB_DOCKABLE
 NO_FULL_REPAINT_ON_RESIZE = _core_.NO_FULL_REPAINT_ON_RESIZE
@@ -3501,7 +3491,6 @@ wxEVT_CLOSE_WINDOW = _core_.wxEVT_CLOSE_WINDOW
 wxEVT_END_SESSION = _core_.wxEVT_END_SESSION
 wxEVT_QUERY_END_SESSION = _core_.wxEVT_QUERY_END_SESSION
 wxEVT_ACTIVATE_APP = _core_.wxEVT_ACTIVATE_APP
-wxEVT_POWER = _core_.wxEVT_POWER
 wxEVT_ACTIVATE = _core_.wxEVT_ACTIVATE
 wxEVT_CREATE = _core_.wxEVT_CREATE
 wxEVT_DESTROY = _core_.wxEVT_DESTROY
@@ -3557,7 +3546,7 @@ EVT_ERASE_BACKGROUND = wx.PyEventBinder( wxEVT_ERASE_BACKGROUND )
 EVT_CHAR = wx.PyEventBinder( wxEVT_CHAR )
 EVT_KEY_DOWN = wx.PyEventBinder( wxEVT_KEY_DOWN )
 EVT_KEY_UP = wx.PyEventBinder( wxEVT_KEY_UP )
-EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1) 
+EVT_HOTKEY = wx.PyEventBinder( wxEVT_HOTKEY, 1)
 EVT_CHAR_HOOK = wx.PyEventBinder( wxEVT_CHAR_HOOK )
 EVT_MENU_OPEN = wx.PyEventBinder( wxEVT_MENU_OPEN )
 EVT_MENU_CLOSE = wx.PyEventBinder( wxEVT_MENU_CLOSE )
@@ -3568,7 +3557,7 @@ EVT_KILL_FOCUS = wx.PyEventBinder( wxEVT_KILL_FOCUS )
 EVT_CHILD_FOCUS = wx.PyEventBinder( wxEVT_CHILD_FOCUS )
 EVT_ACTIVATE = wx.PyEventBinder( wxEVT_ACTIVATE )
 EVT_ACTIVATE_APP = wx.PyEventBinder( wxEVT_ACTIVATE_APP )
-EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )     
+EVT_HIBERNATE = wx.PyEventBinder( wxEVT_HIBERNATE )
 EVT_END_SESSION = wx.PyEventBinder( wxEVT_END_SESSION )
 EVT_QUERY_END_SESSION = wx.PyEventBinder( wxEVT_QUERY_END_SESSION )
 EVT_DROP_FILES = wx.PyEventBinder( wxEVT_DROP_FILES )
@@ -3617,11 +3606,11 @@ EVT_MOUSE_EVENTS = wx.PyEventBinder([ wxEVT_LEFT_DOWN,


 # Scrolling from wxWindow (sent to wxScrolledWindow)
-EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP, 
+EVT_SCROLLWIN = wx.PyEventBinder([ wxEVT_SCROLLWIN_TOP,
                                  wxEVT_SCROLLWIN_BOTTOM,
                                  wxEVT_SCROLLWIN_LINEUP,
                                  wxEVT_SCROLLWIN_LINEDOWN,
-                                  wxEVT_SCROLLWIN_PAGEUP, 
+                                  wxEVT_SCROLLWIN_PAGEUP,
                                  wxEVT_SCROLLWIN_PAGEDOWN,
                                  wxEVT_SCROLLWIN_THUMBTRACK,
                                  wxEVT_SCROLLWIN_THUMBRELEASE,
@@ -3637,14 +3626,14 @@ EVT_SCROLLWIN_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBTRACK )
 EVT_SCROLLWIN_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLLWIN_THUMBRELEASE )

 # Scrolling from wx.Slider and wx.ScrollBar
-EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP, 
-                               wxEVT_SCROLL_BOTTOM, 
-                               wxEVT_SCROLL_LINEUP, 
-                               wxEVT_SCROLL_LINEDOWN, 
-                               wxEVT_SCROLL_PAGEUP, 
-                               wxEVT_SCROLL_PAGEDOWN, 
-                               wxEVT_SCROLL_THUMBTRACK, 
-                               wxEVT_SCROLL_THUMBRELEASE, 
+EVT_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
+                               wxEVT_SCROLL_BOTTOM,
+                               wxEVT_SCROLL_LINEUP,
+                               wxEVT_SCROLL_LINEDOWN,
+                               wxEVT_SCROLL_PAGEUP,
+                               wxEVT_SCROLL_PAGEDOWN,
+                               wxEVT_SCROLL_THUMBTRACK,
+                               wxEVT_SCROLL_THUMBRELEASE,
                               wxEVT_SCROLL_CHANGED,
                               ])

@@ -3658,15 +3647,15 @@ EVT_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK )
 EVT_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE )
 EVT_SCROLL_CHANGED = wx.PyEventBinder( wxEVT_SCROLL_CHANGED )
 EVT_SCROLL_ENDSCROLL = EVT_SCROLL_CHANGED
-     
+
 # Scrolling from wx.Slider and wx.ScrollBar, with an id
-EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP, 
-                                       wxEVT_SCROLL_BOTTOM, 
-                                       wxEVT_SCROLL_LINEUP, 
-                                       wxEVT_SCROLL_LINEDOWN, 
-                                       wxEVT_SCROLL_PAGEUP, 
-                                       wxEVT_SCROLL_PAGEDOWN, 
-                                       wxEVT_SCROLL_THUMBTRACK, 
+EVT_COMMAND_SCROLL = wx.PyEventBinder([ wxEVT_SCROLL_TOP,
+                                       wxEVT_SCROLL_BOTTOM,
+                                       wxEVT_SCROLL_LINEUP,
+                                       wxEVT_SCROLL_LINEDOWN,
+                                       wxEVT_SCROLL_PAGEUP,
+                                       wxEVT_SCROLL_PAGEDOWN,
+                                       wxEVT_SCROLL_THUMBTRACK,
                                       wxEVT_SCROLL_THUMBRELEASE,
                                       wxEVT_SCROLL_CHANGED,
                                       ], 1)
@@ -8403,6 +8392,14 @@ class Window(EvtHandler):
        """
        return _core_.Window_RemoveChild(*args, **kwargs)

+    def SetDoubleBuffered(*args, **kwargs):
+        """
+        SetDoubleBuffered(self, bool on)
+
+        Currently wxGTK2 only.
+        """
+        return _core_.Window_SetDoubleBuffered(*args, **kwargs)
+
    def FindWindowById(*args, **kwargs):
        """
        FindWindowById(self, long winid) -> Window
--- a/wxPython/src/msw/_core_wrap.cpp
+++ b/wxPython/src/msw/_core_wrap.cpp
@@ -3790,6 +3790,7 @@ SWIGINTERN PyObject *wxWindow_GetChildren(wxWindow *self){
            wxWindowList& list = self->GetChildren();
            return wxPy_ConvertList(&list);
        }
+SWIGINTERN void wxWindow_SetDoubleBuffered(wxWindow *self,bool on){}
 SWIGINTERN bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode){
        #if wxUSE_HOTKEY
            return self->RegisterHotKey(hotkeyId, modifiers, keycode);
@@ -33181,6 +33182,44 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_Window_SetDoubleBuffered(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxWindow *arg1 = (wxWindow *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  PyObject * obj0 = 0 ;
+  PyObject * obj1 = 0 ;
+  char *  kwnames[] = {
+    (char *) "self",(char *) "on", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetDoubleBuffered",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_SetDoubleBuffered" "', expected argument " "1"" of type '" "wxWindow *""'"); 
+  }
+  arg1 = reinterpret_cast< wxWindow * >(argp1);
+  ecode2 = SWIG_AsVal_bool(obj1, &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "Window_SetDoubleBuffered" "', expected argument " "2"" of type '" "bool""'");
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    wxWindow_SetDoubleBuffered(arg1,arg2);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *_wrap_Window_FindWindowById(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
  PyObject *resultobj = 0;
  wxWindow *arg1 = (wxWindow *) 0 ;
@@ -53486,6 +53525,7 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"Window_Reparent", (PyCFunction) _wrap_Window_Reparent, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_AddChild", (PyCFunction) _wrap_Window_AddChild, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_RemoveChild", (PyCFunction) _wrap_Window_RemoveChild, METH_VARARGS | METH_KEYWORDS, NULL},
+	 { (char *)"Window_SetDoubleBuffered", (PyCFunction) _wrap_Window_SetDoubleBuffered, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_FindWindowById", (PyCFunction) _wrap_Window_FindWindowById, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_FindWindowByName", (PyCFunction) _wrap_Window_FindWindowByName, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"Window_GetEventHandler", (PyCFunction)_wrap_Window_GetEventHandler, METH_O, NULL},
@@ -55754,13 +55794,6 @@ SWIGEXPORT void SWIG_init(void) {
  SWIG_Python_SetConstant(d, "ID_UNDELETE",SWIG_From_int(static_cast< int >(wxID_UNDELETE)));
  SWIG_Python_SetConstant(d, "ID_REVERT_TO_SAVED",SWIG_From_int(static_cast< int >(wxID_REVERT_TO_SAVED)));
  SWIG_Python_SetConstant(d, "ID_HIGHEST",SWIG_From_int(static_cast< int >(wxID_HIGHEST)));
-  SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
-  SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
-  SWIG_Python_SetConstant(d, "HIDE_READONLY",SWIG_From_int(static_cast< int >(wxHIDE_READONLY)));
-  SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
-  SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
-  SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
-  SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
  SWIG_Python_SetConstant(d, "ACCEL_ALT",SWIG_From_int(static_cast< int >(wxACCEL_ALT)));
  SWIG_Python_SetConstant(d, "ACCEL_CTRL",SWIG_From_int(static_cast< int >(wxACCEL_CTRL)));
  SWIG_Python_SetConstant(d, "ACCEL_SHIFT",SWIG_From_int(static_cast< int >(wxACCEL_SHIFT)));
@@ -55773,9 +55806,6 @@ SWIGEXPORT void SWIG_init(void) {
  SWIG_Python_SetConstant(d, "PD_REMAINING_TIME",SWIG_From_int(static_cast< int >(wxPD_REMAINING_TIME)));
  SWIG_Python_SetConstant(d, "PD_SMOOTH",SWIG_From_int(static_cast< int >(wxPD_SMOOTH)));
  SWIG_Python_SetConstant(d, "PD_CAN_SKIP",SWIG_From_int(static_cast< int >(wxPD_CAN_SKIP)));
-  SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
-  SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
-  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
  SWIG_Python_SetConstant(d, "MENU_TEAROFF",SWIG_From_int(static_cast< int >(wxMENU_TEAROFF)));
  SWIG_Python_SetConstant(d, "MB_DOCKABLE",SWIG_From_int(static_cast< int >(wxMB_DOCKABLE)));
  SWIG_Python_SetConstant(d, "NO_FULL_REPAINT_ON_RESIZE",SWIG_From_int(static_cast< int >(wxNO_FULL_REPAINT_ON_RESIZE)));
@@ -56355,7 +56385,6 @@ SWIGEXPORT void SWIG_init(void) {
  PyDict_SetItemString(d, "wxEVT_END_SESSION", PyInt_FromLong(wxEVT_END_SESSION));
  PyDict_SetItemString(d, "wxEVT_QUERY_END_SESSION", PyInt_FromLong(wxEVT_QUERY_END_SESSION));
  PyDict_SetItemString(d, "wxEVT_ACTIVATE_APP", PyInt_FromLong(wxEVT_ACTIVATE_APP));
-  PyDict_SetItemString(d, "wxEVT_POWER", PyInt_FromLong(wxEVT_POWER));
  PyDict_SetItemString(d, "wxEVT_ACTIVATE", PyInt_FromLong(wxEVT_ACTIVATE));
  PyDict_SetItemString(d, "wxEVT_CREATE", PyInt_FromLong(wxEVT_CREATE));
  PyDict_SetItemString(d, "wxEVT_DESTROY", PyInt_FromLong(wxEVT_DESTROY));
--- a/wxPython/src/msw/_gdi.py
+++ b/wxPython/src/msw/_gdi.py
@@ -1376,7 +1376,7 @@ class NativeFontInfo(object):
        return _gdi_.NativeFontInfo_SetUnderlined(*args, **kwargs)

    def SetFaceName(*args, **kwargs):
-        """SetFaceName(self, String facename)"""
+        """SetFaceName(self, String facename) -> bool"""
        return _gdi_.NativeFontInfo_SetFaceName(*args, **kwargs)

    def SetFamily(*args, **kwargs):
@@ -1767,7 +1767,7 @@ class Font(GDIObject):

    def SetFaceName(*args, **kwargs):
        """
-        SetFaceName(self, String faceName)
+        SetFaceName(self, String faceName) -> bool

        Sets the facename for the font.  The facename, which should be a valid
        font installed on the end-user's system.
@@ -1806,7 +1806,7 @@ class Font(GDIObject):

    def SetNativeFontInfoFromString(*args, **kwargs):
        """
-        SetNativeFontInfoFromString(self, String info)
+        SetNativeFontInfoFromString(self, String info) -> bool

        Set the font's attributes from string representation of a
        `wx.NativeFontInfo` object.
@@ -1815,7 +1815,7 @@ class Font(GDIObject):

    def SetNativeFontInfoUserDesc(*args, **kwargs):
        """
-        SetNativeFontInfoUserDesc(self, String info)
+        SetNativeFontInfoUserDesc(self, String info) -> bool

        Set the font's attributes from a string formerly returned from
        `GetNativeFontInfoDesc`.
@@ -1998,15 +1998,44 @@ class FontEnumerator(object):
        return _gdi_.FontEnumerator_EnumerateEncodings(*args, **kwargs)

    def GetEncodings(*args, **kwargs):
-        """GetEncodings(self) -> PyObject"""
+        """GetEncodings() -> PyObject"""
        return _gdi_.FontEnumerator_GetEncodings(*args, **kwargs)

+    GetEncodings = staticmethod(GetEncodings)
    def GetFacenames(*args, **kwargs):
-        """GetFacenames(self) -> PyObject"""
+        """GetFacenames() -> PyObject"""
        return _gdi_.FontEnumerator_GetFacenames(*args, **kwargs)

+    GetFacenames = staticmethod(GetFacenames)
+    def IsValidFacename(*args, **kwargs):
+        """
+        IsValidFacename(String str) -> bool
+
+        Convenience function that returns true if the given face name exist in
+        the user's system
+        """
+        return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
+
+    IsValidFacename = staticmethod(IsValidFacename)
 _gdi_.FontEnumerator_swigregister(FontEnumerator)

+def FontEnumerator_GetEncodings(*args):
+  """FontEnumerator_GetEncodings() -> PyObject"""
+  return _gdi_.FontEnumerator_GetEncodings(*args)
+
+def FontEnumerator_GetFacenames(*args):
+  """FontEnumerator_GetFacenames() -> PyObject"""
+  return _gdi_.FontEnumerator_GetFacenames(*args)
+
+def FontEnumerator_IsValidFacename(*args, **kwargs):
+  """
+    FontEnumerator_IsValidFacename(String str) -> bool
+
+    Convenience function that returns true if the given face name exist in
+    the user's system
+    """
+  return _gdi_.FontEnumerator_IsValidFacename(*args, **kwargs)
+
 #---------------------------------------------------------------------------

 LANGUAGE_DEFAULT = _gdi_.LANGUAGE_DEFAULT
@@ -4519,44 +4548,50 @@ class StockGDI(object):

    def _initStockObjects():
        import wx
-        wx.ITALIC_FONT  = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC)
-        wx.NORMAL_FONT  = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL)
-        wx.SMALL_FONT   = StockGDI.instance().GetFont(StockGDI.FONT_SMALL)
-        wx.SWISS_FONT   = StockGDI.instance().GetFont(StockGDI.FONT_SWISS)
+        wx.ITALIC_FONT.this  = StockGDI.instance().GetFont(StockGDI.FONT_ITALIC).this
+        wx.NORMAL_FONT.this  = StockGDI.instance().GetFont(StockGDI.FONT_NORMAL).this
+        wx.SMALL_FONT.this   = StockGDI.instance().GetFont(StockGDI.FONT_SMALL).this
+        wx.SWISS_FONT.this   = StockGDI.instance().GetFont(StockGDI.FONT_SWISS).this
                                              
-        wx.BLACK_DASHED_PEN  = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED)
-        wx.BLACK_PEN         = StockGDI.GetPen(StockGDI.PEN_BLACK)
-        wx.CYAN_PEN          = StockGDI.GetPen(StockGDI.PEN_CYAN)
-        wx.GREEN_PEN         = StockGDI.GetPen(StockGDI.PEN_GREEN)
-        wx.GREY_PEN          = StockGDI.GetPen(StockGDI.PEN_GREY)
-        wx.LIGHT_GREY_PEN    = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY)
-        wx.MEDIUM_GREY_PEN   = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY)
-        wx.RED_PEN           = StockGDI.GetPen(StockGDI.PEN_RED)
-        wx.TRANSPARENT_PEN   = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT)
-        wx.WHITE_PEN         = StockGDI.GetPen(StockGDI.PEN_WHITE)
+        wx.BLACK_DASHED_PEN.this  = StockGDI.GetPen(StockGDI.PEN_BLACKDASHED).this
+        wx.BLACK_PEN.this         = StockGDI.GetPen(StockGDI.PEN_BLACK).this
+        wx.CYAN_PEN.this          = StockGDI.GetPen(StockGDI.PEN_CYAN).this
+        wx.GREEN_PEN.this         = StockGDI.GetPen(StockGDI.PEN_GREEN).this
+        wx.GREY_PEN.this          = StockGDI.GetPen(StockGDI.PEN_GREY).this
+        wx.LIGHT_GREY_PEN.this    = StockGDI.GetPen(StockGDI.PEN_LIGHTGREY).this
+        wx.MEDIUM_GREY_PEN.this   = StockGDI.GetPen(StockGDI.PEN_MEDIUMGREY).this
+        wx.RED_PEN.this           = StockGDI.GetPen(StockGDI.PEN_RED).this
+        wx.TRANSPARENT_PEN.this   = StockGDI.GetPen(StockGDI.PEN_TRANSPARENT).this
+        wx.WHITE_PEN.this         = StockGDI.GetPen(StockGDI.PEN_WHITE).this

-        wx.BLACK_BRUSH        = StockGDI.GetBrush(StockGDI.BRUSH_BLACK)
-        wx.BLUE_BRUSH         = StockGDI.GetBrush(StockGDI.BRUSH_BLUE)
-        wx.CYAN_BRUSH         = StockGDI.GetBrush(StockGDI.BRUSH_CYAN)
-        wx.GREEN_BRUSH        = StockGDI.GetBrush(StockGDI.BRUSH_GREEN)
-        wx.GREY_BRUSH         = StockGDI.GetBrush(StockGDI.BRUSH_GREY)
-        wx.LIGHT_GREY_BRUSH   = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY)
-        wx.MEDIUM_GREY_BRUSH  = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY)
-        wx.RED_BRUSH          = StockGDI.GetBrush(StockGDI.BRUSH_RED)
-        wx.TRANSPARENT_BRUSH  = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT)
-        wx.WHITE_BRUSH        = StockGDI.GetBrush(StockGDI.BRUSH_WHITE)
+        wx.BLACK_BRUSH.this        = StockGDI.GetBrush(StockGDI.BRUSH_BLACK).this
+        wx.BLUE_BRUSH.this         = StockGDI.GetBrush(StockGDI.BRUSH_BLUE).this
+        wx.CYAN_BRUSH.this         = StockGDI.GetBrush(StockGDI.BRUSH_CYAN).this
+        wx.GREEN_BRUSH.this        = StockGDI.GetBrush(StockGDI.BRUSH_GREEN).this
+        wx.GREY_BRUSH.this         = StockGDI.GetBrush(StockGDI.BRUSH_GREY).this
+        wx.LIGHT_GREY_BRUSH.this   = StockGDI.GetBrush(StockGDI.BRUSH_LIGHTGREY).this
+        wx.MEDIUM_GREY_BRUSH.this  = StockGDI.GetBrush(StockGDI.BRUSH_MEDIUMGREY).this
+        wx.RED_BRUSH.this          = StockGDI.GetBrush(StockGDI.BRUSH_RED).this
+        wx.TRANSPARENT_BRUSH.this  = StockGDI.GetBrush(StockGDI.BRUSH_TRANSPARENT).this
+        wx.WHITE_BRUSH.this        = StockGDI.GetBrush(StockGDI.BRUSH_WHITE).this

-        wx.BLACK       = StockGDI.GetColour(StockGDI.COLOUR_BLACK)
-        wx.BLUE        = StockGDI.GetColour(StockGDI.COLOUR_BLUE)
-        wx.CYAN        = StockGDI.GetColour(StockGDI.COLOUR_CYAN)
-        wx.GREEN       = StockGDI.GetColour(StockGDI.COLOUR_GREEN)
-        wx.LIGHT_GREY  = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY)
-        wx.RED         = StockGDI.GetColour(StockGDI.COLOUR_RED)
-        wx.WHITE       = StockGDI.GetColour(StockGDI.COLOUR_WHITE)
+        wx.BLACK.this       = StockGDI.GetColour(StockGDI.COLOUR_BLACK).this
+        wx.BLUE.this        = StockGDI.GetColour(StockGDI.COLOUR_BLUE).this
+        wx.CYAN.this        = StockGDI.GetColour(StockGDI.COLOUR_CYAN).this
+        wx.GREEN.this       = StockGDI.GetColour(StockGDI.COLOUR_GREEN).this
+        wx.LIGHT_GREY.this  = StockGDI.GetColour(StockGDI.COLOUR_LIGHTGREY).this
+        wx.RED.this         = StockGDI.GetColour(StockGDI.COLOUR_RED).this
+        wx.WHITE.this       = StockGDI.GetColour(StockGDI.COLOUR_WHITE).this
+
+        wx.CROSS_CURSOR.this      = StockGDI.GetCursor(StockGDI.CURSOR_CROSS).this
+        wx.HOURGLASS_CURSOR.this  = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS).this
+        wx.STANDARD_CURSOR.this   = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD).this
+
+        wx.TheFontList.this       = _wxPyInitTheFontList().this
+        wx.ThePenList.this        = _wxPyInitThePenList().this
+        wx.TheBrushList.this      = _wxPyInitTheBrushList().this
+        wx.TheColourDatabase.this = _wxPyInitTheColourDatabase().this

-        wx.CROSS_CURSOR      = StockGDI.GetCursor(StockGDI.CURSOR_CROSS)
-        wx.HOURGLASS_CURSOR  = StockGDI.GetCursor(StockGDI.CURSOR_HOURGLASS)
-        wx.STANDARD_CURSOR   = StockGDI.GetCursor(StockGDI.CURSOR_STANDARD)
        
    _initStockObjects = staticmethod(_initStockObjects)

@@ -4586,6 +4621,47 @@ def StockGDI_GetPen(*args, **kwargs):
  """StockGDI_GetPen(int item) -> Pen"""
  return _gdi_.StockGDI_GetPen(*args, **kwargs)

+# Create an uninitialized instance for the stock objects, they will
+# be initialized later when the wx.App object is created.
+ITALIC_FONT  = Font.__new__(Font)
+NORMAL_FONT  = Font.__new__(Font)
+SMALL_FONT   = Font.__new__(Font)
+SWISS_FONT   = Font.__new__(Font)
+                                   
+BLACK_DASHED_PEN  = Pen.__new__(Pen)
+BLACK_PEN         = Pen.__new__(Pen)
+CYAN_PEN          = Pen.__new__(Pen)
+GREEN_PEN         = Pen.__new__(Pen)
+GREY_PEN          = Pen.__new__(Pen)
+LIGHT_GREY_PEN    = Pen.__new__(Pen)
+MEDIUM_GREY_PEN   = Pen.__new__(Pen)
+RED_PEN           = Pen.__new__(Pen)
+TRANSPARENT_PEN   = Pen.__new__(Pen)
+WHITE_PEN         = Pen.__new__(Pen)
+
+BLACK_BRUSH        = Brush.__new__(Brush)
+BLUE_BRUSH         = Brush.__new__(Brush)
+CYAN_BRUSH         = Brush.__new__(Brush)
+GREEN_BRUSH        = Brush.__new__(Brush)
+GREY_BRUSH         = Brush.__new__(Brush)
+LIGHT_GREY_BRUSH   = Brush.__new__(Brush)
+MEDIUM_GREY_BRUSH  = Brush.__new__(Brush)
+RED_BRUSH          = Brush.__new__(Brush)
+TRANSPARENT_BRUSH  = Brush.__new__(Brush)
+WHITE_BRUSH        = Brush.__new__(Brush)
+
+BLACK       = Colour.__new__(Colour)
+BLUE        = Colour.__new__(Colour)
+CYAN        = Colour.__new__(Colour)
+GREEN       = Colour.__new__(Colour)
+LIGHT_GREY  = Colour.__new__(Colour)
+RED         = Colour.__new__(Colour)
+WHITE       = Colour.__new__(Colour)
+
+CROSS_CURSOR      = Cursor.__new__(Cursor)
+HOURGLASS_CURSOR  = Cursor.__new__(Cursor)
+STANDARD_CURSOR   = Cursor.__new__(Cursor)
+
 class GDIObjListBase(object):
    """Proxy of C++ GDIObjListBase class"""
    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -4722,29 +4798,12 @@ def _wxPyInitTheBrushList(*args):
 def _wxPyInitTheColourDatabase(*args):
  """_wxPyInitTheColourDatabase() -> ColourDatabase"""
  return _gdi_._wxPyInitTheColourDatabase(*args)
-# This function makes a class used to do delayed initialization of some
-# stock wx objects.  When they are used the first time then an init function
-# is called to make the real instance, which is then used to replace the
-# original instance and class seen by the programmer.
-def _wxPyMakeDelayedInitWrapper(initFunc):
-    class _wxPyStockObjectWrapper(object):
-        def __init__(self, *args):
-            self._args = args
-        def __getattr__(self, name):
-            obj = initFunc(*self._args)
-            self.__class__ = obj.__class__
-            self.__dict__ = obj.__dict__
-            return getattr(self, name)
-        def __str__(self):
-            return self.__getattr__("__str__")()
-        def __repr__(self):
-            return self.__getattr__("__repr__")()
-    return _wxPyStockObjectWrapper
-    
-TheFontList       = _wxPyMakeDelayedInitWrapper(_wxPyInitTheFontList)()
-ThePenList        = _wxPyMakeDelayedInitWrapper(_wxPyInitThePenList)()
-TheBrushList      = _wxPyMakeDelayedInitWrapper(_wxPyInitTheBrushList)()
-TheColourDatabase = _wxPyMakeDelayedInitWrapper(_wxPyInitTheColourDatabase)()
+# Create an uninitialized instance for the stock objects, they will
+# be initialized later when the wx.App object is created.
+TheFontList       = FontList.__new__(FontList)
+ThePenList        = PenList.__new__(PenList)
+TheBrushList      = BrushList.__new__(BrushList)
+TheColourDatabase = ColourDatabase.__new__(ColourDatabase)

 NullColor = NullColour 
 #---------------------------------------------------------------------------
@@ -4913,6 +4972,11 @@ class RendererNative(object):
    genereic controls in ways that are as close to the native look as
    possible.

+    Note that each drawing function restores the `wx.DC` attributes if it
+    changes them, so it is safe to assume that the same pen, brush and
+    colours that were active before the call to this function are still in
+    effect after it.
+
    """
    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
    def __init__(self): raise AttributeError, "No constructor defined"
--- a/wxPython/src/msw/_gdi_wrap.cpp
+++ b/wxPython/src/msw/_gdi_wrap.cpp
@@ -3077,25 +3077,19 @@ IMP_PYCALLBACK_BOOL_STRING(wxPyFontEnumerator, wxFontEnumerator, OnFacename);
 IMP_PYCALLBACK_BOOL_STRINGSTRING(wxPyFontEnumerator, wxFontEnumerator, OnFontEncoding);


-SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(wxPyFontEnumerator *self){
+SWIGINTERN PyObject *wxPyFontEnumerator_GetEncodings(){
            PyObject* ret;
-            wxArrayString* arr = self->GetEncodings();
+            wxArrayString arr = wxFontEnumerator::GetEncodings();
            wxPyBlock_t blocked = wxPyBeginBlockThreads();            
-            if (arr)
-                ret = wxArrayString2PyList_helper(*arr);
-            else
-                ret = PyList_New(0);
+            ret = wxArrayString2PyList_helper(arr);
            wxPyEndBlockThreads(blocked);
            return ret;
        }
-SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(wxPyFontEnumerator *self){
+SWIGINTERN PyObject *wxPyFontEnumerator_GetFacenames(){
            PyObject* ret;
-            wxArrayString* arr = self->GetFacenames();
+            wxArrayString arr = wxFontEnumerator::GetFacenames();
            wxPyBlock_t blocked = wxPyBeginBlockThreads();            
-            if (arr)
-                ret = wxArrayString2PyList_helper(*arr);
-            else
-                ret =  PyList_New(0);
+            ret = wxArrayString2PyList_helper(arr);
            wxPyEndBlockThreads(blocked);
            return ret;
        }
@@ -10511,6 +10505,7 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
  PyObject *resultobj = 0;
  wxNativeFontInfo *arg1 = (wxNativeFontInfo *) 0 ;
  wxString arg2 ;
+  bool result;
  void *argp1 = 0 ;
  int res1 = 0 ;
  PyObject * obj0 = 0 ;
@@ -10533,11 +10528,13 @@ SWIGINTERN PyObject *_wrap_NativeFontInfo_SetFaceName(PyObject *SWIGUNUSEDPARM(s
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetFaceName(arg2);
+    result = (bool)(arg1)->SetFaceName(arg2);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
  return resultobj;
 fail:
  return NULL;
@@ -12900,6 +12897,7 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
  PyObject *resultobj = 0;
  wxFont *arg1 = (wxFont *) 0 ;
  wxString *arg2 = 0 ;
+  bool result;
  void *argp1 = 0 ;
  int res1 = 0 ;
  bool temp2 = false ;
@@ -12922,11 +12920,13 @@ SWIGINTERN PyObject *_wrap_Font_SetFaceName(PyObject *SWIGUNUSEDPARM(self), PyOb
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetFaceName((wxString const &)*arg2);
+    result = (bool)(arg1)->SetFaceName((wxString const &)*arg2);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
  {
    if (temp2)
    delete arg2;
@@ -13062,6 +13062,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
  PyObject *resultobj = 0;
  wxFont *arg1 = (wxFont *) 0 ;
  wxString *arg2 = 0 ;
+  bool result;
  void *argp1 = 0 ;
  int res1 = 0 ;
  bool temp2 = false ;
@@ -13084,11 +13085,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoFromString(PyObject *SWIGUNUSED
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetNativeFontInfo((wxString const &)*arg2);
+    result = (bool)(arg1)->SetNativeFontInfo((wxString const &)*arg2);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
  {
    if (temp2)
    delete arg2;
@@ -13107,6 +13110,7 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
  PyObject *resultobj = 0;
  wxFont *arg1 = (wxFont *) 0 ;
  wxString *arg2 = 0 ;
+  bool result;
  void *argp1 = 0 ;
  int res1 = 0 ;
  bool temp2 = false ;
@@ -13129,11 +13133,13 @@ SWIGINTERN PyObject *_wrap_Font_SetNativeFontInfoUserDesc(PyObject *SWIGUNUSEDPA
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
+    result = (bool)(arg1)->SetNativeFontInfoUserDesc((wxString const &)*arg2);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
-  resultobj = SWIG_Py_Void();
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
  {
    if (temp2)
    delete arg2;
@@ -13578,22 +13584,12 @@ fail:

 SWIGINTERN PyObject *_wrap_FontEnumerator_GetEncodings(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *resultobj = 0;
-  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
  PyObject *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_wxPyFontEnumerator, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetEncodings" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetEncodings",0,0,0)) SWIG_fail;
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (PyObject *)wxPyFontEnumerator_GetEncodings(arg1);
+    result = (PyObject *)wxPyFontEnumerator_GetEncodings();
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -13606,22 +13602,12 @@ fail:

 SWIGINTERN PyObject *_wrap_FontEnumerator_GetFacenames(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *resultobj = 0;
-  wxPyFontEnumerator *arg1 = (wxPyFontEnumerator *) 0 ;
  PyObject *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_wxPyFontEnumerator, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FontEnumerator_GetFacenames" "', expected argument " "1"" of type '" "wxPyFontEnumerator *""'"); 
-  }
-  arg1 = reinterpret_cast< wxPyFontEnumerator * >(argp1);
+  if (!SWIG_Python_UnpackTuple(args,"FontEnumerator_GetFacenames",0,0,0)) SWIG_fail;
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (PyObject *)wxPyFontEnumerator_GetFacenames(arg1);
+    result = (PyObject *)wxPyFontEnumerator_GetFacenames();
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
@@ -13632,6 +13618,45 @@ fail:
 }


+SWIGINTERN PyObject *_wrap_FontEnumerator_IsValidFacename(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
+  PyObject *resultobj = 0;
+  wxString *arg1 = 0 ;
+  bool result;
+  bool temp1 = false ;
+  PyObject * obj0 = 0 ;
+  char *  kwnames[] = {
+    (char *) "str", NULL 
+  };
+  
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:FontEnumerator_IsValidFacename",kwnames,&obj0)) SWIG_fail;
+  {
+    arg1 = wxString_in_helper(obj0);
+    if (arg1 == NULL) SWIG_fail;
+    temp1 = true;
+  }
+  {
+    PyThreadState* __tstate = wxPyBeginAllowThreads();
+    result = (bool)wxPyFontEnumerator::IsValidFacename((wxString const &)*arg1);
+    wxPyEndAllowThreads(__tstate);
+    if (PyErr_Occurred()) SWIG_fail;
+  }
+  {
+    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
+  }
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return resultobj;
+fail:
+  {
+    if (temp1)
+    delete arg1;
+  }
+  return NULL;
+}
+
+
 SWIGINTERN PyObject *FontEnumerator_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *obj;
  if (!SWIG_Python_UnpackTuple(args,(char*)"swigregister", 1, 1,&obj)) return NULL;
@@ -25670,6 +25695,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Get(PyObject *SWIGUNUSEDPARM(self), Py
  
  if (!SWIG_Python_UnpackTuple(args,"RendererNative_Get",0,0,0)) SWIG_fail;
  {
+    if (!wxPyCheckForApp()) SWIG_fail;
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    {
      wxRendererNative &_result_ref = wxRendererNative::Get();
@@ -25691,6 +25717,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetGeneric(PyObject *SWIGUNUSEDPARM(se
  
  if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetGeneric",0,0,0)) SWIG_fail;
  {
+    if (!wxPyCheckForApp()) SWIG_fail;
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    {
      wxRendererNative &_result_ref = wxRendererNative::GetGeneric();
@@ -25712,6 +25739,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_GetDefault(PyObject *SWIGUNUSEDPARM(se
  
  if (!SWIG_Python_UnpackTuple(args,"RendererNative_GetDefault",0,0,0)) SWIG_fail;
  {
+    if (!wxPyCheckForApp()) SWIG_fail;
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    {
      wxRendererNative &_result_ref = wxRendererNative::GetDefault();
@@ -25745,6 +25773,7 @@ SWIGINTERN PyObject *_wrap_RendererNative_Set(PyObject *SWIGUNUSEDPARM(self), Py
  }
  arg1 = reinterpret_cast< wxRendererNative * >(argp1);
  {
+    if (!wxPyCheckForApp()) SWIG_fail;
    PyThreadState* __tstate = wxPyBeginAllowThreads();
    result = (wxRendererNative *)wxRendererNative::Set(arg1);
    wxPyEndAllowThreads(__tstate);
@@ -26102,8 +26131,9 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FontEnumerator__setCallbackInfo", (PyCFunction) _wrap_FontEnumerator__setCallbackInfo, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FontEnumerator_EnumerateFacenames", (PyCFunction) _wrap_FontEnumerator_EnumerateFacenames, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FontEnumerator_EnumerateEncodings", (PyCFunction) _wrap_FontEnumerator_EnumerateEncodings, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_O, NULL},
-	 { (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_O, NULL},
+	 { (char *)"FontEnumerator_GetEncodings", (PyCFunction)_wrap_FontEnumerator_GetEncodings, METH_NOARGS, NULL},
+	 { (char *)"FontEnumerator_GetFacenames", (PyCFunction)_wrap_FontEnumerator_GetFacenames, METH_NOARGS, NULL},
+	 { (char *)"FontEnumerator_IsValidFacename", (PyCFunction) _wrap_FontEnumerator_IsValidFacename, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FontEnumerator_swigregister", FontEnumerator_swigregister, METH_VARARGS, NULL},
 	 { (char *)"FontEnumerator_swiginit", FontEnumerator_swiginit, METH_VARARGS, NULL},
 	 { (char *)"LanguageInfo_Language_set", _wrap_LanguageInfo_Language_set, METH_VARARGS, NULL},
--- a/wxPython/src/msw/_misc.py
+++ b/wxPython/src/msw/_misc.py
@@ -432,7 +432,7 @@ def SaveFileSelector(*args, **kwargs):
 def DirSelector(*args, **kwargs):
  """
    DirSelector(String message=DirSelectorPromptStr, String defaultPath=EmptyString, 
-        long style=DD_DEFAULT_STYLE, 
+        long style=wxDD_DEFAULT_STYLE, 
        Point pos=DefaultPosition, Window parent=None) -> String
    """
  return _misc_.DirSelector(*args, **kwargs)
@@ -5776,5 +5776,65 @@ def StandardPaths_Get(*args):
    """
  return _misc_.StandardPaths_Get(*args)

+#---------------------------------------------------------------------------
+
+POWER_SOCKET = _misc_.POWER_SOCKET
+POWER_BATTERY = _misc_.POWER_BATTERY
+POWER_UNKNOWN = _misc_.POWER_UNKNOWN
+BATTERY_NORMAL_STATE = _misc_.BATTERY_NORMAL_STATE
+BATTERY_LOW_STATE = _misc_.BATTERY_LOW_STATE
+BATTERY_CRITICAL_STATE = _misc_.BATTERY_CRITICAL_STATE
+BATTERY_SHUTDOWN_STATE = _misc_.BATTERY_SHUTDOWN_STATE
+BATTERY_UNKNOWN_STATE = _misc_.BATTERY_UNKNOWN_STATE
+class PowerEvent(_core.Event):
+    """
+    wx.PowerEvent is generated when the system online status changes.
+    Currently this is only implemented for Windows.
+    """
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    __repr__ = _swig_repr
+    def __init__(self, *args, **kwargs): 
+        """
+        __init__(self, EventType evtType) -> PowerEvent
+
+        wx.PowerEvent is generated when the system online status changes.
+        Currently this is only implemented for Windows.
+        """
+        _misc_.PowerEvent_swiginit(self,_misc_.new_PowerEvent(*args, **kwargs))
+    def Veto(*args, **kwargs):
+        """Veto(self)"""
+        return _misc_.PowerEvent_Veto(*args, **kwargs)
+
+    def IsVetoed(*args, **kwargs):
+        """IsVetoed(self) -> bool"""
+        return _misc_.PowerEvent_IsVetoed(*args, **kwargs)
+
+_misc_.PowerEvent_swigregister(PowerEvent)
+
+wxEVT_POWER_SUSPENDING = _misc_.wxEVT_POWER_SUSPENDING
+wxEVT_POWER_SUSPENDED = _misc_.wxEVT_POWER_SUSPENDED
+wxEVT_POWER_SUSPEND_CANCEL = _misc_.wxEVT_POWER_SUSPEND_CANCEL
+wxEVT_POWER_RESUME = _misc_.wxEVT_POWER_RESUME
+EVT_POWER_SUSPENDING       = wx.PyEventBinder( wxEVT_POWER_SUSPENDING , 1 )
+EVT_POWER_SUSPENDED        = wx.PyEventBinder( wxEVT_POWER_SUSPENDED , 1 )
+EVT_POWER_SUSPEND_CANCEL   = wx.PyEventBinder( wxEVT_POWER_SUSPEND_CANCEL , 1 )
+EVT_POWER_RESUME           = wx.PyEventBinder( wxEVT_POWER_RESUME , 1 )
+
+
+def GetPowerType(*args):
+  """
+    GetPowerType() -> int
+
+    return the current system power state: online or offline
+    """
+  return _misc_.GetPowerType(*args)
+
+def GetBatteryState(*args):
+  """
+    GetBatteryState() -> int
+
+    return approximate battery state
+    """
+  return _misc_.GetBatteryState(*args)


--- a/wxPython/src/msw/_misc_wrap.cpp
+++ b/wxPython/src/msw/_misc_wrap.cpp
--- a/wxPython/src/msw/_windows.py
+++ b/wxPython/src/msw/_windows.py
@@ -2147,6 +2147,9 @@ def GetColourFromUser(*args, **kwargs):
        String caption=EmptyString) -> Colour
    """
  return _windows_.GetColourFromUser(*args, **kwargs)
+DD_NEW_DIR_BUTTON = _windows_.DD_NEW_DIR_BUTTON
+DD_DEFAULT_STYLE = _windows_.DD_DEFAULT_STYLE
+DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
 class DirDialog(Dialog):
    """
    wx.DirDialog allows the user to select a directory by browising the
@@ -2157,7 +2160,7 @@ class DirDialog(Dialog):
    def __init__(self, *args, **kwargs): 
        """
        __init__(self, Window parent, String message=DirSelectorPromptStr, 
-            String defaultPath=EmptyString, long style=0, 
+            String defaultPath=EmptyString, long style=DD_DEFAULT_STYLE, 
            Point pos=DefaultPosition, Size size=DefaultSize, 
            String name=DirDialogNameStr) -> DirDialog

@@ -2200,6 +2203,19 @@ class DirDialog(Dialog):

 _windows_.DirDialog_swigregister(DirDialog)

+OPEN = _windows_.OPEN
+SAVE = _windows_.SAVE
+OVERWRITE_PROMPT = _windows_.OVERWRITE_PROMPT
+FILE_MUST_EXIST = _windows_.FILE_MUST_EXIST
+MULTIPLE = _windows_.MULTIPLE
+CHANGE_DIR = _windows_.CHANGE_DIR
+FD_OPEN = _windows_.FD_OPEN
+FD_SAVE = _windows_.FD_SAVE
+FD_OVERWRITE_PROMPT = _windows_.FD_OVERWRITE_PROMPT
+FD_FILE_MUST_EXIST = _windows_.FD_FILE_MUST_EXIST
+FD_MULTIPLE = _windows_.FD_MULTIPLE
+FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR
+FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE
 class FileDialog(Dialog):
    """
    wx.FileDialog allows the user to select one or more files from the
@@ -2212,7 +2228,8 @@ class FileDialog(Dialog):
        __init__(self, Window parent, String message=FileSelectorPromptStr, 
            String defaultDir=EmptyString, String defaultFile=EmptyString, 
            String wildcard=FileSelectorDefaultWildcardStr, 
-            long style=0, Point pos=DefaultPosition) -> FileDialog
+            long style=FD_DEFAULT_STYLE, 
+            Point pos=DefaultPosition) -> FileDialog

        Constructor.  Use ShowModal method to show the dialog.
        """
@@ -2264,14 +2281,6 @@ class FileDialog(Dialog):
        """
        return _windows_.FileDialog_SetWildcard(*args, **kwargs)

-    def SetStyle(*args, **kwargs):
-        """
-        SetStyle(self, long style)
-
-        Sets the dialog style.
-        """
-        return _windows_.FileDialog_SetStyle(*args, **kwargs)
-
    def SetFilterIndex(*args, **kwargs):
        """
        SetFilterIndex(self, int filterIndex)
@@ -2320,14 +2329,6 @@ class FileDialog(Dialog):
        """
        return _windows_.FileDialog_GetWildcard(*args, **kwargs)

-    def GetStyle(*args, **kwargs):
-        """
-        GetStyle(self) -> long
-
-        Returns the dialog style.
-        """
-        return _windows_.FileDialog_GetStyle(*args, **kwargs)
-
    def GetFilterIndex(*args, **kwargs):
        """
        GetFilterIndex(self) -> int
@@ -2758,11 +2759,11 @@ EVT_FIND_REPLACE_ALL = wx.PyEventBinder( wxEVT_COMMAND_FIND_REPLACE_ALL, 1 )
 EVT_FIND_CLOSE = wx.PyEventBinder( wxEVT_COMMAND_FIND_CLOSE, 1 )

 # For backwards compatibility.  Should they be removed?
-EVT_COMMAND_FIND             = EVT_FIND 
+EVT_COMMAND_FIND             = EVT_FIND
 EVT_COMMAND_FIND_NEXT        = EVT_FIND_NEXT
 EVT_COMMAND_FIND_REPLACE     = EVT_FIND_REPLACE
 EVT_COMMAND_FIND_REPLACE_ALL = EVT_FIND_REPLACE_ALL
-EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE        
+EVT_COMMAND_FIND_CLOSE       = EVT_FIND_CLOSE

 class FindDialogEvent(_core.CommandEvent):
    """Events for the FindReplaceDialog"""
--- a/wxPython/src/msw/_windows_wrap.cpp
+++ b/wxPython/src/msw/_windows_wrap.cpp
@@ -16700,7 +16700,7 @@ SWIGINTERN PyObject *_wrap_new_DirDialog(PyObject *SWIGUNUSEDPARM(self), PyObjec
  wxString *arg2 = (wxString *) &arg2_defvalue ;
  wxString const &arg3_defvalue = wxPyEmptyString ;
  wxString *arg3 = (wxString *) &arg3_defvalue ;
-  long arg4 = (long) 0 ;
+  long arg4 = (long) wxDD_DEFAULT_STYLE ;
  wxPoint const &arg5_defvalue = wxDefaultPosition ;
  wxPoint *arg5 = (wxPoint *) &arg5_defvalue ;
  wxSize const &arg6_defvalue = wxDefaultSize ;
@@ -16992,7 +16992,7 @@ SWIGINTERN PyObject *_wrap_new_FileDialog(PyObject *SWIGUNUSEDPARM(self), PyObje
  wxString *arg4 = (wxString *) &arg4_defvalue ;
  wxString const &arg5_defvalue = wxPyFileSelectorDefaultWildcardStr ;
  wxString *arg5 = (wxString *) &arg5_defvalue ;
-  long arg6 = (long) 0 ;
+  long arg6 = (long) wxFD_DEFAULT_STYLE ;
  wxPoint const &arg7_defvalue = wxDefaultPosition ;
  wxPoint *arg7 = (wxPoint *) &arg7_defvalue ;
  wxFileDialog *result = 0 ;
@@ -17334,44 +17334,6 @@ fail:
 }


-SWIGINTERN PyObject *_wrap_FileDialog_SetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxFileDialog *arg1 = (wxFileDialog *) 0 ;
-  long arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  long val2 ;
-  int ecode2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "style", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:FileDialog_SetStyle",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxFileDialog, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_SetStyle" "', expected argument " "1"" of type '" "wxFileDialog *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFileDialog * >(argp1);
-  ecode2 = SWIG_AsVal_long(obj1, &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "FileDialog_SetStyle" "', expected argument " "2"" of type '" "long""'");
-  } 
-  arg2 = static_cast< long >(val2);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    (arg1)->SetStyle(arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FileDialog_SetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
  PyObject *resultobj = 0;
  wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -17580,34 +17542,6 @@ fail:
 }


-SWIGINTERN PyObject *_wrap_FileDialog_GetStyle(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *resultobj = 0;
-  wxFileDialog *arg1 = (wxFileDialog *) 0 ;
-  long 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_wxFileDialog, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FileDialog_GetStyle" "', expected argument " "1"" of type '" "wxFileDialog const *""'"); 
-  }
-  arg1 = reinterpret_cast< wxFileDialog * >(argp1);
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (long)((wxFileDialog const *)arg1)->GetStyle();
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  resultobj = SWIG_From_long(static_cast< long >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_FileDialog_GetFilterIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
  PyObject *resultobj = 0;
  wxFileDialog *arg1 = (wxFileDialog *) 0 ;
@@ -31096,14 +31030,12 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"FileDialog_SetDirectory", (PyCFunction) _wrap_FileDialog_SetDirectory, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FileDialog_SetFilename", (PyCFunction) _wrap_FileDialog_SetFilename, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FileDialog_SetWildcard", (PyCFunction) _wrap_FileDialog_SetWildcard, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"FileDialog_SetStyle", (PyCFunction) _wrap_FileDialog_SetStyle, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FileDialog_SetFilterIndex", (PyCFunction) _wrap_FileDialog_SetFilterIndex, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"FileDialog_GetMessage", (PyCFunction)_wrap_FileDialog_GetMessage, METH_O, NULL},
 	 { (char *)"FileDialog_GetPath", (PyCFunction)_wrap_FileDialog_GetPath, METH_O, NULL},
 	 { (char *)"FileDialog_GetDirectory", (PyCFunction)_wrap_FileDialog_GetDirectory, METH_O, NULL},
 	 { (char *)"FileDialog_GetFilename", (PyCFunction)_wrap_FileDialog_GetFilename, METH_O, NULL},
 	 { (char *)"FileDialog_GetWildcard", (PyCFunction)_wrap_FileDialog_GetWildcard, METH_O, NULL},
-	 { (char *)"FileDialog_GetStyle", (PyCFunction)_wrap_FileDialog_GetStyle, METH_O, NULL},
 	 { (char *)"FileDialog_GetFilterIndex", (PyCFunction)_wrap_FileDialog_GetFilterIndex, METH_O, NULL},
 	 { (char *)"FileDialog_GetFilenames", (PyCFunction)_wrap_FileDialog_GetFilenames, METH_O, NULL},
 	 { (char *)"FileDialog_GetPaths", (PyCFunction)_wrap_FileDialog_GetPaths, METH_O, NULL},
@@ -33803,6 +33735,22 @@ SWIGEXPORT void SWIG_init(void) {
  SWIG_addvarlink(SWIG_globals(),(char*)"FileSelectorDefaultWildcardStr",FileSelectorDefaultWildcardStr_get, FileSelectorDefaultWildcardStr_set);
  SWIG_addvarlink(SWIG_globals(),(char*)"GetTextFromUserPromptStr",GetTextFromUserPromptStr_get, GetTextFromUserPromptStr_set);
  SWIG_addvarlink(SWIG_globals(),(char*)"MessageBoxCaptionStr",MessageBoxCaptionStr_get, MessageBoxCaptionStr_set);
+  SWIG_Python_SetConstant(d, "DD_NEW_DIR_BUTTON",SWIG_From_int(static_cast< int >(wxDD_NEW_DIR_BUTTON)));
+  SWIG_Python_SetConstant(d, "DD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxDD_DEFAULT_STYLE)));
+  SWIG_Python_SetConstant(d, "DD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxDD_CHANGE_DIR)));
+  SWIG_Python_SetConstant(d, "OPEN",SWIG_From_int(static_cast< int >(wxOPEN)));
+  SWIG_Python_SetConstant(d, "SAVE",SWIG_From_int(static_cast< int >(wxSAVE)));
+  SWIG_Python_SetConstant(d, "OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxOVERWRITE_PROMPT)));
+  SWIG_Python_SetConstant(d, "FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFILE_MUST_EXIST)));
+  SWIG_Python_SetConstant(d, "MULTIPLE",SWIG_From_int(static_cast< int >(wxMULTIPLE)));
+  SWIG_Python_SetConstant(d, "CHANGE_DIR",SWIG_From_int(static_cast< int >(wxCHANGE_DIR)));
+  SWIG_Python_SetConstant(d, "FD_OPEN",SWIG_From_int(static_cast< int >(wxFD_OPEN)));
+  SWIG_Python_SetConstant(d, "FD_SAVE",SWIG_From_int(static_cast< int >(wxFD_SAVE)));
+  SWIG_Python_SetConstant(d, "FD_OVERWRITE_PROMPT",SWIG_From_int(static_cast< int >(wxFD_OVERWRITE_PROMPT)));
+  SWIG_Python_SetConstant(d, "FD_FILE_MUST_EXIST",SWIG_From_int(static_cast< int >(wxFD_FILE_MUST_EXIST)));
+  SWIG_Python_SetConstant(d, "FD_MULTIPLE",SWIG_From_int(static_cast< int >(wxFD_MULTIPLE)));
+  SWIG_Python_SetConstant(d, "FD_CHANGE_DIR",SWIG_From_int(static_cast< int >(wxFD_CHANGE_DIR)));
+  SWIG_Python_SetConstant(d, "FD_DEFAULT_STYLE",SWIG_From_int(static_cast< int >(wxFD_DEFAULT_STYLE)));
  SWIG_Python_SetConstant(d, "CHOICEDLG_STYLE",SWIG_From_int(static_cast< int >(wxCHOICEDLG_STYLE)));
  SWIG_Python_SetConstant(d, "TextEntryDialogStyle",SWIG_From_int(static_cast< int >(wxTextEntryDialogStyle)));
  SWIG_addvarlink(SWIG_globals(),(char*)"GetPasswordFromUserPromptStr",GetPasswordFromUserPromptStr_get, GetPasswordFromUserPromptStr_set);
--- a/wxPython/src/msw/html.py
+++ b/wxPython/src/msw/html.py
@@ -686,10 +686,6 @@ class HtmlCell(_core.Object):
        """ProcessMouseClick(self, HtmlWindowInterface window, Point pos, MouseEvent event) -> bool"""
        return _html.HtmlCell_ProcessMouseClick(*args, **kwargs)

-    def AdjustPagebreak(*args, **kwargs):
-        """AdjustPagebreak(self, int INOUT) -> bool"""
-        return _html.HtmlCell_AdjustPagebreak(*args, **kwargs)
-
    def SetCanLiveOnPagebreak(*args, **kwargs):
        """SetCanLiveOnPagebreak(self, bool can)"""
        return _html.HtmlCell_SetCanLiveOnPagebreak(*args, **kwargs)
@@ -1197,8 +1193,8 @@ class HtmlDCRenderer(_core.Object):

    def Render(*args, **kwargs):
        """
-        Render(self, int x, int y, int from=0, int dont_render=False, int maxHeight=INT_MAX, 
-            int choices=None, int LCOUNT=0) -> int
+        Render(self, int x, int y, wxArrayInt known_pagebreaks, int from=0, 
+            int dont_render=False, int to=INT_MAX) -> int
        """
        return _html.HtmlDCRenderer_Render(*args, **kwargs)

--- a/wxPython/src/msw/html_wrap.cpp
+++ b/wxPython/src/msw/html_wrap.cpp
@@ -2469,195 +2469,196 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int argnum, int flags)
 #define SWIGTYPE_p_wxANIHandler swig_types[7]
 #define SWIGTYPE_p_wxAcceleratorTable swig_types[8]
 #define SWIGTYPE_p_wxActivateEvent swig_types[9]
-#define SWIGTYPE_p_wxBMPHandler swig_types[10]
-#define SWIGTYPE_p_wxBitmap swig_types[11]
-#define SWIGTYPE_p_wxBoxSizer swig_types[12]
-#define SWIGTYPE_p_wxCURHandler swig_types[13]
-#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[14]
-#define SWIGTYPE_p_wxChildFocusEvent swig_types[15]
-#define SWIGTYPE_p_wxClipboardTextEvent swig_types[16]
-#define SWIGTYPE_p_wxCloseEvent swig_types[17]
-#define SWIGTYPE_p_wxColour swig_types[18]
-#define SWIGTYPE_p_wxColourData swig_types[19]
-#define SWIGTYPE_p_wxColourDialog swig_types[20]
-#define SWIGTYPE_p_wxCommandEvent swig_types[21]
-#define SWIGTYPE_p_wxConfigBase swig_types[22]
-#define SWIGTYPE_p_wxContextMenuEvent swig_types[23]
-#define SWIGTYPE_p_wxControl swig_types[24]
-#define SWIGTYPE_p_wxControlWithItems swig_types[25]
-#define SWIGTYPE_p_wxCursor swig_types[26]
-#define SWIGTYPE_p_wxDC swig_types[27]
-#define SWIGTYPE_p_wxDateEvent swig_types[28]
-#define SWIGTYPE_p_wxDefaultHtmlRenderingStyle swig_types[29]
-#define SWIGTYPE_p_wxDialog swig_types[30]
-#define SWIGTYPE_p_wxDirDialog swig_types[31]
-#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[32]
-#define SWIGTYPE_p_wxDropFilesEvent swig_types[33]
-#define SWIGTYPE_p_wxDuplexMode swig_types[34]
-#define SWIGTYPE_p_wxEraseEvent swig_types[35]
-#define SWIGTYPE_p_wxEvent swig_types[36]
-#define SWIGTYPE_p_wxEvtHandler swig_types[37]
-#define SWIGTYPE_p_wxFSFile swig_types[38]
-#define SWIGTYPE_p_wxFileDialog swig_types[39]
-#define SWIGTYPE_p_wxFileSystem swig_types[40]
-#define SWIGTYPE_p_wxFindDialogEvent swig_types[41]
-#define SWIGTYPE_p_wxFindReplaceData swig_types[42]
-#define SWIGTYPE_p_wxFindReplaceDialog swig_types[43]
-#define SWIGTYPE_p_wxFlexGridSizer swig_types[44]
-#define SWIGTYPE_p_wxFocusEvent swig_types[45]
-#define SWIGTYPE_p_wxFont swig_types[46]
-#define SWIGTYPE_p_wxFontData swig_types[47]
-#define SWIGTYPE_p_wxFontDialog swig_types[48]
-#define SWIGTYPE_p_wxFrame swig_types[49]
-#define SWIGTYPE_p_wxGBSizerItem swig_types[50]
-#define SWIGTYPE_p_wxGIFHandler swig_types[51]
-#define SWIGTYPE_p_wxGridBagSizer swig_types[52]
-#define SWIGTYPE_p_wxGridSizer swig_types[53]
-#define SWIGTYPE_p_wxHelpControllerBase swig_types[54]
-#define SWIGTYPE_p_wxHelpSearchMode swig_types[55]
-#define SWIGTYPE_p_wxHtmlBookRecArray swig_types[56]
-#define SWIGTYPE_p_wxHtmlBookRecord swig_types[57]
-#define SWIGTYPE_p_wxHtmlCell swig_types[58]
-#define SWIGTYPE_p_wxHtmlColourCell swig_types[59]
-#define SWIGTYPE_p_wxHtmlContainerCell swig_types[60]
-#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[61]
-#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[62]
-#define SWIGTYPE_p_wxHtmlFilter swig_types[63]
-#define SWIGTYPE_p_wxHtmlFontCell swig_types[64]
-#define SWIGTYPE_p_wxHtmlHelpController swig_types[65]
-#define SWIGTYPE_p_wxHtmlHelpData swig_types[66]
-#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[67]
-#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[68]
-#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[69]
-#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[70]
-#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[71]
-#define SWIGTYPE_p_wxHtmlModalHelp swig_types[72]
-#define SWIGTYPE_p_wxHtmlParser swig_types[73]
-#define SWIGTYPE_p_wxHtmlPrintout swig_types[74]
-#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[75]
-#define SWIGTYPE_p_wxHtmlRenderingState swig_types[76]
-#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[77]
-#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[78]
-#define SWIGTYPE_p_wxHtmlSelection swig_types[79]
-#define SWIGTYPE_p_wxHtmlTag swig_types[80]
-#define SWIGTYPE_p_wxHtmlTagHandler swig_types[81]
-#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[82]
-#define SWIGTYPE_p_wxHtmlWinParser swig_types[83]
-#define SWIGTYPE_p_wxHtmlWindow swig_types[84]
-#define SWIGTYPE_p_wxHtmlWindowEvent swig_types[85]
-#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[86]
-#define SWIGTYPE_p_wxHtmlWordCell swig_types[87]
-#define SWIGTYPE_p_wxICOHandler swig_types[88]
-#define SWIGTYPE_p_wxIconizeEvent swig_types[89]
-#define SWIGTYPE_p_wxIdleEvent swig_types[90]
-#define SWIGTYPE_p_wxImage swig_types[91]
-#define SWIGTYPE_p_wxImageHandler swig_types[92]
-#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[93]
-#define SWIGTYPE_p_wxInitDialogEvent swig_types[94]
-#define SWIGTYPE_p_wxJPEGHandler swig_types[95]
-#define SWIGTYPE_p_wxKeyEvent swig_types[96]
-#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[97]
-#define SWIGTYPE_p_wxLayoutConstraints swig_types[98]
-#define SWIGTYPE_p_wxMDIChildFrame swig_types[99]
-#define SWIGTYPE_p_wxMDIClientWindow swig_types[100]
-#define SWIGTYPE_p_wxMDIParentFrame swig_types[101]
-#define SWIGTYPE_p_wxMaximizeEvent swig_types[102]
-#define SWIGTYPE_p_wxMenu swig_types[103]
-#define SWIGTYPE_p_wxMenuBar swig_types[104]
-#define SWIGTYPE_p_wxMenuEvent swig_types[105]
-#define SWIGTYPE_p_wxMenuItem swig_types[106]
-#define SWIGTYPE_p_wxMessageDialog swig_types[107]
-#define SWIGTYPE_p_wxMiniFrame swig_types[108]
-#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[109]
-#define SWIGTYPE_p_wxMouseEvent swig_types[110]
-#define SWIGTYPE_p_wxMoveEvent swig_types[111]
-#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[112]
-#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[113]
-#define SWIGTYPE_p_wxNcPaintEvent swig_types[114]
-#define SWIGTYPE_p_wxNotifyEvent swig_types[115]
-#define SWIGTYPE_p_wxObject swig_types[116]
-#define SWIGTYPE_p_wxPCXHandler swig_types[117]
-#define SWIGTYPE_p_wxPNGHandler swig_types[118]
-#define SWIGTYPE_p_wxPNMHandler swig_types[119]
-#define SWIGTYPE_p_wxPageSetupDialog swig_types[120]
-#define SWIGTYPE_p_wxPageSetupDialogData swig_types[121]
-#define SWIGTYPE_p_wxPaintEvent swig_types[122]
-#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[123]
-#define SWIGTYPE_p_wxPanel swig_types[124]
-#define SWIGTYPE_p_wxPaperSize swig_types[125]
-#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[126]
-#define SWIGTYPE_p_wxPoint swig_types[127]
-#define SWIGTYPE_p_wxPopupWindow swig_types[128]
-#define SWIGTYPE_p_wxPreviewCanvas swig_types[129]
-#define SWIGTYPE_p_wxPreviewControlBar swig_types[130]
-#define SWIGTYPE_p_wxPreviewFrame swig_types[131]
-#define SWIGTYPE_p_wxPrintData swig_types[132]
-#define SWIGTYPE_p_wxPrintDialog swig_types[133]
-#define SWIGTYPE_p_wxPrintDialogData swig_types[134]
-#define SWIGTYPE_p_wxPrintPreview swig_types[135]
-#define SWIGTYPE_p_wxPrinter swig_types[136]
-#define SWIGTYPE_p_wxProgressDialog swig_types[137]
-#define SWIGTYPE_p_wxPyApp swig_types[138]
-#define SWIGTYPE_p_wxPyCommandEvent swig_types[139]
-#define SWIGTYPE_p_wxPyEvent swig_types[140]
-#define SWIGTYPE_p_wxPyHtmlFilter swig_types[141]
-#define SWIGTYPE_p_wxPyHtmlListBox swig_types[142]
-#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[143]
-#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[144]
-#define SWIGTYPE_p_wxPyHtmlWindow swig_types[145]
-#define SWIGTYPE_p_wxPyImageHandler swig_types[146]
-#define SWIGTYPE_p_wxPyPanel swig_types[147]
-#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[148]
-#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[149]
-#define SWIGTYPE_p_wxPyPreviewFrame swig_types[150]
-#define SWIGTYPE_p_wxPyPrintPreview swig_types[151]
-#define SWIGTYPE_p_wxPyPrintout swig_types[152]
-#define SWIGTYPE_p_wxPyScrolledWindow swig_types[153]
-#define SWIGTYPE_p_wxPySizer swig_types[154]
-#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[155]
-#define SWIGTYPE_p_wxPyVListBox swig_types[156]
-#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[157]
-#define SWIGTYPE_p_wxPyValidator swig_types[158]
-#define SWIGTYPE_p_wxPyWindow swig_types[159]
-#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[160]
-#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[161]
-#define SWIGTYPE_p_wxSashEvent swig_types[162]
-#define SWIGTYPE_p_wxSashLayoutWindow swig_types[163]
-#define SWIGTYPE_p_wxSashWindow swig_types[164]
-#define SWIGTYPE_p_wxScrollEvent swig_types[165]
-#define SWIGTYPE_p_wxScrollWinEvent swig_types[166]
-#define SWIGTYPE_p_wxScrolledWindow swig_types[167]
-#define SWIGTYPE_p_wxSetCursorEvent swig_types[168]
-#define SWIGTYPE_p_wxShowEvent swig_types[169]
-#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[170]
-#define SWIGTYPE_p_wxSize swig_types[171]
-#define SWIGTYPE_p_wxSizeEvent swig_types[172]
-#define SWIGTYPE_p_wxSizer swig_types[173]
-#define SWIGTYPE_p_wxSizerItem swig_types[174]
-#define SWIGTYPE_p_wxSplashScreen swig_types[175]
-#define SWIGTYPE_p_wxSplashScreenWindow swig_types[176]
-#define SWIGTYPE_p_wxSplitterEvent swig_types[177]
-#define SWIGTYPE_p_wxSplitterWindow swig_types[178]
-#define SWIGTYPE_p_wxStaticBoxSizer swig_types[179]
-#define SWIGTYPE_p_wxStatusBar swig_types[180]
-#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[181]
-#define SWIGTYPE_p_wxString swig_types[182]
-#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[183]
-#define SWIGTYPE_p_wxTIFFHandler swig_types[184]
-#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[185]
-#define SWIGTYPE_p_wxTextEntryDialog swig_types[186]
-#define SWIGTYPE_p_wxTipWindow swig_types[187]
-#define SWIGTYPE_p_wxTopLevelWindow swig_types[188]
-#define SWIGTYPE_p_wxTreeCtrl swig_types[189]
-#define SWIGTYPE_p_wxUpdateUIEvent swig_types[190]
-#define SWIGTYPE_p_wxValidator swig_types[191]
-#define SWIGTYPE_p_wxVisualAttributes swig_types[192]
-#define SWIGTYPE_p_wxWindow swig_types[193]
-#define SWIGTYPE_p_wxWindowCreateEvent swig_types[194]
-#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[195]
-#define SWIGTYPE_p_wxXPMHandler swig_types[196]
-static swig_type_info *swig_types[198];
-static swig_module_info swig_module = {swig_types, 197, 0, 0, 0, 0};
+#define SWIGTYPE_p_wxArrayInt swig_types[10]
+#define SWIGTYPE_p_wxBMPHandler swig_types[11]
+#define SWIGTYPE_p_wxBitmap swig_types[12]
+#define SWIGTYPE_p_wxBoxSizer swig_types[13]
+#define SWIGTYPE_p_wxCURHandler swig_types[14]
+#define SWIGTYPE_p_wxCalculateLayoutEvent swig_types[15]
+#define SWIGTYPE_p_wxChildFocusEvent swig_types[16]
+#define SWIGTYPE_p_wxClipboardTextEvent swig_types[17]
+#define SWIGTYPE_p_wxCloseEvent swig_types[18]
+#define SWIGTYPE_p_wxColour swig_types[19]
+#define SWIGTYPE_p_wxColourData swig_types[20]
+#define SWIGTYPE_p_wxColourDialog swig_types[21]
+#define SWIGTYPE_p_wxCommandEvent swig_types[22]
+#define SWIGTYPE_p_wxConfigBase swig_types[23]
+#define SWIGTYPE_p_wxContextMenuEvent swig_types[24]
+#define SWIGTYPE_p_wxControl swig_types[25]
+#define SWIGTYPE_p_wxControlWithItems swig_types[26]
+#define SWIGTYPE_p_wxCursor swig_types[27]
+#define SWIGTYPE_p_wxDC swig_types[28]
+#define SWIGTYPE_p_wxDateEvent swig_types[29]
+#define SWIGTYPE_p_wxDefaultHtmlRenderingStyle swig_types[30]
+#define SWIGTYPE_p_wxDialog swig_types[31]
+#define SWIGTYPE_p_wxDirDialog swig_types[32]
+#define SWIGTYPE_p_wxDisplayChangedEvent swig_types[33]
+#define SWIGTYPE_p_wxDropFilesEvent swig_types[34]
+#define SWIGTYPE_p_wxDuplexMode swig_types[35]
+#define SWIGTYPE_p_wxEraseEvent swig_types[36]
+#define SWIGTYPE_p_wxEvent swig_types[37]
+#define SWIGTYPE_p_wxEvtHandler swig_types[38]
+#define SWIGTYPE_p_wxFSFile swig_types[39]
+#define SWIGTYPE_p_wxFileDialog swig_types[40]
+#define SWIGTYPE_p_wxFileSystem swig_types[41]
+#define SWIGTYPE_p_wxFindDialogEvent swig_types[42]
+#define SWIGTYPE_p_wxFindReplaceData swig_types[43]
+#define SWIGTYPE_p_wxFindReplaceDialog swig_types[44]
+#define SWIGTYPE_p_wxFlexGridSizer swig_types[45]
+#define SWIGTYPE_p_wxFocusEvent swig_types[46]
+#define SWIGTYPE_p_wxFont swig_types[47]
+#define SWIGTYPE_p_wxFontData swig_types[48]
+#define SWIGTYPE_p_wxFontDialog swig_types[49]
+#define SWIGTYPE_p_wxFrame swig_types[50]
+#define SWIGTYPE_p_wxGBSizerItem swig_types[51]
+#define SWIGTYPE_p_wxGIFHandler swig_types[52]
+#define SWIGTYPE_p_wxGridBagSizer swig_types[53]
+#define SWIGTYPE_p_wxGridSizer swig_types[54]
+#define SWIGTYPE_p_wxHelpControllerBase swig_types[55]
+#define SWIGTYPE_p_wxHelpSearchMode swig_types[56]
+#define SWIGTYPE_p_wxHtmlBookRecArray swig_types[57]
+#define SWIGTYPE_p_wxHtmlBookRecord swig_types[58]
+#define SWIGTYPE_p_wxHtmlCell swig_types[59]
+#define SWIGTYPE_p_wxHtmlColourCell swig_types[60]
+#define SWIGTYPE_p_wxHtmlContainerCell swig_types[61]
+#define SWIGTYPE_p_wxHtmlDCRenderer swig_types[62]
+#define SWIGTYPE_p_wxHtmlEasyPrinting swig_types[63]
+#define SWIGTYPE_p_wxHtmlFilter swig_types[64]
+#define SWIGTYPE_p_wxHtmlFontCell swig_types[65]
+#define SWIGTYPE_p_wxHtmlHelpController swig_types[66]
+#define SWIGTYPE_p_wxHtmlHelpData swig_types[67]
+#define SWIGTYPE_p_wxHtmlHelpDialog swig_types[68]
+#define SWIGTYPE_p_wxHtmlHelpFrame swig_types[69]
+#define SWIGTYPE_p_wxHtmlHelpFrameCfg swig_types[70]
+#define SWIGTYPE_p_wxHtmlHelpWindow swig_types[71]
+#define SWIGTYPE_p_wxHtmlLinkInfo swig_types[72]
+#define SWIGTYPE_p_wxHtmlModalHelp swig_types[73]
+#define SWIGTYPE_p_wxHtmlParser swig_types[74]
+#define SWIGTYPE_p_wxHtmlPrintout swig_types[75]
+#define SWIGTYPE_p_wxHtmlRenderingInfo swig_types[76]
+#define SWIGTYPE_p_wxHtmlRenderingState swig_types[77]
+#define SWIGTYPE_p_wxHtmlRenderingStyle swig_types[78]
+#define SWIGTYPE_p_wxHtmlSearchStatus swig_types[79]
+#define SWIGTYPE_p_wxHtmlSelection swig_types[80]
+#define SWIGTYPE_p_wxHtmlTag swig_types[81]
+#define SWIGTYPE_p_wxHtmlTagHandler swig_types[82]
+#define SWIGTYPE_p_wxHtmlWidgetCell swig_types[83]
+#define SWIGTYPE_p_wxHtmlWinParser swig_types[84]
+#define SWIGTYPE_p_wxHtmlWindow swig_types[85]
+#define SWIGTYPE_p_wxHtmlWindowEvent swig_types[86]
+#define SWIGTYPE_p_wxHtmlWindowInterface swig_types[87]
+#define SWIGTYPE_p_wxHtmlWordCell swig_types[88]
+#define SWIGTYPE_p_wxICOHandler swig_types[89]
+#define SWIGTYPE_p_wxIconizeEvent swig_types[90]
+#define SWIGTYPE_p_wxIdleEvent swig_types[91]
+#define SWIGTYPE_p_wxImage swig_types[92]
+#define SWIGTYPE_p_wxImageHandler swig_types[93]
+#define SWIGTYPE_p_wxIndividualLayoutConstraint swig_types[94]
+#define SWIGTYPE_p_wxInitDialogEvent swig_types[95]
+#define SWIGTYPE_p_wxJPEGHandler swig_types[96]
+#define SWIGTYPE_p_wxKeyEvent swig_types[97]
+#define SWIGTYPE_p_wxLayoutAlgorithm swig_types[98]
+#define SWIGTYPE_p_wxLayoutConstraints swig_types[99]
+#define SWIGTYPE_p_wxMDIChildFrame swig_types[100]
+#define SWIGTYPE_p_wxMDIClientWindow swig_types[101]
+#define SWIGTYPE_p_wxMDIParentFrame swig_types[102]
+#define SWIGTYPE_p_wxMaximizeEvent swig_types[103]
+#define SWIGTYPE_p_wxMenu swig_types[104]
+#define SWIGTYPE_p_wxMenuBar swig_types[105]
+#define SWIGTYPE_p_wxMenuEvent swig_types[106]
+#define SWIGTYPE_p_wxMenuItem swig_types[107]
+#define SWIGTYPE_p_wxMessageDialog swig_types[108]
+#define SWIGTYPE_p_wxMiniFrame swig_types[109]
+#define SWIGTYPE_p_wxMouseCaptureChangedEvent swig_types[110]
+#define SWIGTYPE_p_wxMouseEvent swig_types[111]
+#define SWIGTYPE_p_wxMoveEvent swig_types[112]
+#define SWIGTYPE_p_wxMultiChoiceDialog swig_types[113]
+#define SWIGTYPE_p_wxNavigationKeyEvent swig_types[114]
+#define SWIGTYPE_p_wxNcPaintEvent swig_types[115]
+#define SWIGTYPE_p_wxNotifyEvent swig_types[116]
+#define SWIGTYPE_p_wxObject swig_types[117]
+#define SWIGTYPE_p_wxPCXHandler swig_types[118]
+#define SWIGTYPE_p_wxPNGHandler swig_types[119]
+#define SWIGTYPE_p_wxPNMHandler swig_types[120]
+#define SWIGTYPE_p_wxPageSetupDialog swig_types[121]
+#define SWIGTYPE_p_wxPageSetupDialogData swig_types[122]
+#define SWIGTYPE_p_wxPaintEvent swig_types[123]
+#define SWIGTYPE_p_wxPaletteChangedEvent swig_types[124]
+#define SWIGTYPE_p_wxPanel swig_types[125]
+#define SWIGTYPE_p_wxPaperSize swig_types[126]
+#define SWIGTYPE_p_wxPasswordEntryDialog swig_types[127]
+#define SWIGTYPE_p_wxPoint swig_types[128]
+#define SWIGTYPE_p_wxPopupWindow swig_types[129]
+#define SWIGTYPE_p_wxPreviewCanvas swig_types[130]
+#define SWIGTYPE_p_wxPreviewControlBar swig_types[131]
+#define SWIGTYPE_p_wxPreviewFrame swig_types[132]
+#define SWIGTYPE_p_wxPrintData swig_types[133]
+#define SWIGTYPE_p_wxPrintDialog swig_types[134]
+#define SWIGTYPE_p_wxPrintDialogData swig_types[135]
+#define SWIGTYPE_p_wxPrintPreview swig_types[136]
+#define SWIGTYPE_p_wxPrinter swig_types[137]
+#define SWIGTYPE_p_wxProgressDialog swig_types[138]
+#define SWIGTYPE_p_wxPyApp swig_types[139]
+#define SWIGTYPE_p_wxPyCommandEvent swig_types[140]
+#define SWIGTYPE_p_wxPyEvent swig_types[141]
+#define SWIGTYPE_p_wxPyHtmlFilter swig_types[142]
+#define SWIGTYPE_p_wxPyHtmlListBox swig_types[143]
+#define SWIGTYPE_p_wxPyHtmlTagHandler swig_types[144]
+#define SWIGTYPE_p_wxPyHtmlWinTagHandler swig_types[145]
+#define SWIGTYPE_p_wxPyHtmlWindow swig_types[146]
+#define SWIGTYPE_p_wxPyImageHandler swig_types[147]
+#define SWIGTYPE_p_wxPyPanel swig_types[148]
+#define SWIGTYPE_p_wxPyPopupTransientWindow swig_types[149]
+#define SWIGTYPE_p_wxPyPreviewControlBar swig_types[150]
+#define SWIGTYPE_p_wxPyPreviewFrame swig_types[151]
+#define SWIGTYPE_p_wxPyPrintPreview swig_types[152]
+#define SWIGTYPE_p_wxPyPrintout swig_types[153]
+#define SWIGTYPE_p_wxPyScrolledWindow swig_types[154]
+#define SWIGTYPE_p_wxPySizer swig_types[155]
+#define SWIGTYPE_p_wxPyTaskBarIcon swig_types[156]
+#define SWIGTYPE_p_wxPyVListBox swig_types[157]
+#define SWIGTYPE_p_wxPyVScrolledWindow swig_types[158]
+#define SWIGTYPE_p_wxPyValidator swig_types[159]
+#define SWIGTYPE_p_wxPyWindow swig_types[160]
+#define SWIGTYPE_p_wxQueryLayoutInfoEvent swig_types[161]
+#define SWIGTYPE_p_wxQueryNewPaletteEvent swig_types[162]
+#define SWIGTYPE_p_wxSashEvent swig_types[163]
+#define SWIGTYPE_p_wxSashLayoutWindow swig_types[164]
+#define SWIGTYPE_p_wxSashWindow swig_types[165]
+#define SWIGTYPE_p_wxScrollEvent swig_types[166]
+#define SWIGTYPE_p_wxScrollWinEvent swig_types[167]
+#define SWIGTYPE_p_wxScrolledWindow swig_types[168]
+#define SWIGTYPE_p_wxSetCursorEvent swig_types[169]
+#define SWIGTYPE_p_wxShowEvent swig_types[170]
+#define SWIGTYPE_p_wxSingleChoiceDialog swig_types[171]
+#define SWIGTYPE_p_wxSize swig_types[172]
+#define SWIGTYPE_p_wxSizeEvent swig_types[173]
+#define SWIGTYPE_p_wxSizer swig_types[174]
+#define SWIGTYPE_p_wxSizerItem swig_types[175]
+#define SWIGTYPE_p_wxSplashScreen swig_types[176]
+#define SWIGTYPE_p_wxSplashScreenWindow swig_types[177]
+#define SWIGTYPE_p_wxSplitterEvent swig_types[178]
+#define SWIGTYPE_p_wxSplitterWindow swig_types[179]
+#define SWIGTYPE_p_wxStaticBoxSizer swig_types[180]
+#define SWIGTYPE_p_wxStatusBar swig_types[181]
+#define SWIGTYPE_p_wxStdDialogButtonSizer swig_types[182]
+#define SWIGTYPE_p_wxString swig_types[183]
+#define SWIGTYPE_p_wxSysColourChangedEvent swig_types[184]
+#define SWIGTYPE_p_wxTIFFHandler swig_types[185]
+#define SWIGTYPE_p_wxTaskBarIconEvent swig_types[186]
+#define SWIGTYPE_p_wxTextEntryDialog swig_types[187]
+#define SWIGTYPE_p_wxTipWindow swig_types[188]
+#define SWIGTYPE_p_wxTopLevelWindow swig_types[189]
+#define SWIGTYPE_p_wxTreeCtrl swig_types[190]
+#define SWIGTYPE_p_wxUpdateUIEvent swig_types[191]
+#define SWIGTYPE_p_wxValidator swig_types[192]
+#define SWIGTYPE_p_wxVisualAttributes swig_types[193]
+#define SWIGTYPE_p_wxWindow swig_types[194]
+#define SWIGTYPE_p_wxWindowCreateEvent swig_types[195]
+#define SWIGTYPE_p_wxWindowDestroyEvent swig_types[196]
+#define SWIGTYPE_p_wxXPMHandler swig_types[197]
+static swig_type_info *swig_types[199];
+static swig_module_info swig_module = {swig_types, 198, 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)

@@ -7792,58 +7793,6 @@ fail:
 }


-SWIGINTERN PyObject *_wrap_HtmlCell_AdjustPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
-  PyObject *resultobj = 0;
-  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
-  int *arg2 = (int *) 0 ;
-  bool result;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  int temp2 ;
-  int res2 = 0 ;
-  PyObject * obj0 = 0 ;
-  PyObject * obj1 = 0 ;
-  char *  kwnames[] = {
-    (char *) "self",(char *) "INOUT", NULL 
-  };
-  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:HtmlCell_AdjustPagebreak",kwnames,&obj0,&obj1)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlCell, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlCell_AdjustPagebreak" "', expected argument " "1"" of type '" "wxHtmlCell *""'"); 
-  }
-  arg1 = reinterpret_cast< wxHtmlCell * >(argp1);
-  if (!(SWIG_IsOK((res2 = SWIG_ConvertPtr(obj1,SWIG_as_voidptrptr(&arg2),SWIGTYPE_p_int,0))))) {
-    int val; 
-    int ecode = SWIG_AsVal_int(obj1, &val);
-    if (!SWIG_IsOK(ecode)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode), "in method '" "HtmlCell_AdjustPagebreak" "', expected argument " "2"" of type '" "int""'");
-    }
-    temp2 = static_cast< int >(val);
-    arg2 = &temp2;
-    res2 = SWIG_AddTmpMask(ecode);
-  }
-  {
-    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (bool)(arg1)->AdjustPagebreak(arg2);
-    wxPyEndAllowThreads(__tstate);
-    if (PyErr_Occurred()) SWIG_fail;
-  }
-  {
-    resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
-  }
-  if (SWIG_IsTmpObj(res2)) {
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_From_int((*arg2)));
-  } else {
-    int new_flags = SWIG_IsNewObj(res2) ? (SWIG_POINTER_OWN |  0 ) :  0 ;
-    resultobj = SWIG_Python_AppendOutput(resultobj, SWIG_NewPointerObj((void*)(arg2), SWIGTYPE_p_int, new_flags));
-  }
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
 SWIGINTERN PyObject *_wrap_HtmlCell_SetCanLiveOnPagebreak(PyObject *SWIGUNUSEDPARM(self), PyObject *args, PyObject *kwargs) {
  PyObject *resultobj = 0;
  wxHtmlCell *arg1 = (wxHtmlCell *) 0 ;
@@ -11774,11 +11723,10 @@ SWIGINTERN PyObject *_wrap_HtmlDCRenderer_Render(PyObject *SWIGUNUSEDPARM(self),
  wxHtmlDCRenderer *arg1 = (wxHtmlDCRenderer *) 0 ;
  int arg2 ;
  int arg3 ;
-  int arg4 = (int) 0 ;
-  int arg5 = (int) false ;
-  int arg6 = (int) INT_MAX ;
-  int *arg7 = (int *) NULL ;
-  int arg8 = (int) 0 ;
+  wxArrayInt *arg4 = 0 ;
+  int arg5 = (int) 0 ;
+  int arg6 = (int) FALSE ;
+  int arg7 = (int) INT_MAX ;
  int result;
  void *argp1 = 0 ;
  int res1 = 0 ;
@@ -11786,16 +11734,13 @@ SWIGINTERN PyObject *_wrap_HtmlDCRenderer_Render(PyObject *SWIGUNUSEDPARM(self),
  int ecode2 = 0 ;
  int val3 ;
  int ecode3 = 0 ;
-  int val4 ;
-  int ecode4 = 0 ;
+  bool temp4 = false ;
  int val5 ;
  int ecode5 = 0 ;
  int val6 ;
  int ecode6 = 0 ;
-  void *argp7 = 0 ;
-  int res7 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
+  int val7 ;
+  int ecode7 = 0 ;
  PyObject * obj0 = 0 ;
  PyObject * obj1 = 0 ;
  PyObject * obj2 = 0 ;
@@ -11803,12 +11748,11 @@ SWIGINTERN PyObject *_wrap_HtmlDCRenderer_Render(PyObject *SWIGUNUSEDPARM(self),
  PyObject * obj4 = 0 ;
  PyObject * obj5 = 0 ;
  PyObject * obj6 = 0 ;
-  PyObject * obj7 = 0 ;
  char *  kwnames[] = {
-    (char *) "self",(char *) "x",(char *) "y",(char *) "from",(char *) "dont_render",(char *) "maxHeight",(char *) "choices",(char *) "LCOUNT", NULL 
+    (char *) "self",(char *) "x",(char *) "y",(char *) "known_pagebreaks",(char *) "from",(char *) "dont_render",(char *) "to", NULL 
  };
  
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO|OOOOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6,&obj7)) SWIG_fail;
+  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO|OOO:HtmlDCRenderer_Render",kwnames,&obj0,&obj1,&obj2,&obj3,&obj4,&obj5,&obj6)) SWIG_fail;
  res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxHtmlDCRenderer, 0 |  0 );
  if (!SWIG_IsOK(res1)) {
    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "HtmlDCRenderer_Render" "', expected argument " "1"" of type '" "wxHtmlDCRenderer *""'"); 
@@ -11824,12 +11768,21 @@ SWIGINTERN PyObject *_wrap_HtmlDCRenderer_Render(PyObject *SWIGUNUSEDPARM(self),
    SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "HtmlDCRenderer_Render" "', expected argument " "3"" of type '" "int""'");
  } 
  arg3 = static_cast< int >(val3);
-  if (obj3) {
-    ecode4 = SWIG_AsVal_int(obj3, &val4);
-    if (!SWIG_IsOK(ecode4)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "HtmlDCRenderer_Render" "', expected argument " "4"" of type '" "int""'");
-    } 
-    arg4 = static_cast< int >(val4);
+  {
+    if (! PySequence_Check(obj3)) {
+      PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
+      SWIG_fail;
+    }
+    arg4 = new wxArrayInt;
+    temp4 = true;
+    int i, len=PySequence_Length(obj3);
+    for (i=0; i<len; i++) {
+      PyObject* item = PySequence_GetItem(obj3, i);
+      PyObject* number  = PyNumber_Int(item);
+      arg4->Add(PyInt_AS_LONG(number));
+      Py_DECREF(item);
+      Py_DECREF(number);
+    }
  }
  if (obj4) {
    ecode5 = SWIG_AsVal_int(obj4, &val5);
@@ -11846,28 +11799,27 @@ SWIGINTERN PyObject *_wrap_HtmlDCRenderer_Render(PyObject *SWIGUNUSEDPARM(self),
    arg6 = static_cast< int >(val6);
  }
  if (obj6) {
-    res7 = SWIG_ConvertPtr(obj6, &argp7,SWIGTYPE_p_int, 0 |  0 );
-    if (!SWIG_IsOK(res7)) {
-      SWIG_exception_fail(SWIG_ArgError(res7), "in method '" "HtmlDCRenderer_Render" "', expected argument " "7"" of type '" "int *""'"); 
-    }
-    arg7 = reinterpret_cast< int * >(argp7);
-  }
-  if (obj7) {
-    ecode8 = SWIG_AsVal_int(obj7, &val8);
-    if (!SWIG_IsOK(ecode8)) {
-      SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "HtmlDCRenderer_Render" "', expected argument " "8"" of type '" "int""'");
+    ecode7 = SWIG_AsVal_int(obj6, &val7);
+    if (!SWIG_IsOK(ecode7)) {
+      SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "HtmlDCRenderer_Render" "', expected argument " "7"" of type '" "int""'");
    } 
-    arg8 = static_cast< int >(val8);
+    arg7 = static_cast< int >(val7);
  }
  {
    PyThreadState* __tstate = wxPyBeginAllowThreads();
-    result = (int)(arg1)->Render(arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+    result = (int)(arg1)->Render(arg2,arg3,*arg4,arg5,arg6,arg7);
    wxPyEndAllowThreads(__tstate);
    if (PyErr_Occurred()) SWIG_fail;
  }
  resultobj = SWIG_From_int(static_cast< int >(result));
+  {
+    if (temp4) delete arg4;
+  }
  return resultobj;
 fail:
+  {
+    if (temp4) delete arg4;
+  }
  return NULL;
 }

@@ -17678,7 +17630,6 @@ static PyMethodDef SwigMethods[] = {
 	 { (char *)"HtmlCell_DrawInvisible", (PyCFunction) _wrap_HtmlCell_DrawInvisible, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"HtmlCell_Find", (PyCFunction) _wrap_HtmlCell_Find, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"HtmlCell_ProcessMouseClick", (PyCFunction) _wrap_HtmlCell_ProcessMouseClick, METH_VARARGS | METH_KEYWORDS, NULL},
-	 { (char *)"HtmlCell_AdjustPagebreak", (PyCFunction) _wrap_HtmlCell_AdjustPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"HtmlCell_SetCanLiveOnPagebreak", (PyCFunction) _wrap_HtmlCell_SetCanLiveOnPagebreak, METH_VARARGS | METH_KEYWORDS, NULL},
 	 { (char *)"HtmlCell_IsLinebreakAllowed", (PyCFunction)_wrap_HtmlCell_IsLinebreakAllowed, METH_O, NULL},
 	 { (char *)"HtmlCell_IsTerminalCell", (PyCFunction)_wrap_HtmlCell_IsTerminalCell, METH_O, NULL},
@@ -19097,10 +19048,11 @@ static void *_p_wxUpdateUIEventTo_p_wxCommandEvent(void *x) {
 static swig_type_info _swigt__p_bool = {"_p_bool", "bool *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_form_ops_t = {"_p_form_ops_t", "enum form_ops_t *|form_ops_t *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_int = {"_p_int", "int *|wxEventType *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|byte *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|time_t *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_unsigned_long = {"_p_unsigned_long", "unsigned long *|wxUIntPtr *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_wxArrayInt = {"_p_wxArrayInt", "wxArrayInt *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxBitmap = {"_p_wxBitmap", "wxBitmap *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxColour = {"_p_wxColour", "wxColour *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_wxCommandEvent = {"_p_wxCommandEvent", "wxCommandEvent *", 0, 0, (void*)0, 0};
@@ -19303,6 +19255,7 @@ static swig_type_info *swig_type_initial[] = {
  &_swigt__p_wxANIHandler,
  &_swigt__p_wxAcceleratorTable,
  &_swigt__p_wxActivateEvent,
+  &_swigt__p_wxArrayInt,
  &_swigt__p_wxBMPHandler,
  &_swigt__p_wxBitmap,
  &_swigt__p_wxBoxSizer,
@@ -19499,6 +19452,7 @@ static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0
 static swig_cast_info _swigc__p_unsigned_char[] = {  {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_int[] = {  {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_unsigned_long[] = {  {&_swigt__p_unsigned_long, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_wxArrayInt[] = {  {&_swigt__p_wxArrayInt, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxBitmap[] = {  {&_swigt__p_wxBitmap, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxColour[] = {  {&_swigt__p_wxColour, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_wxSashEvent[] = {{&_swigt__p_wxSashEvent, 0, 0, 0},{0, 0, 0, 0}};
@@ -19701,6 +19655,7 @@ static swig_cast_info *swig_cast_initial[] = {
  _swigc__p_wxANIHandler,
  _swigc__p_wxAcceleratorTable,
  _swigc__p_wxActivateEvent,
+  _swigc__p_wxArrayInt,
  _swigc__p_wxBMPHandler,
  _swigc__p_wxBitmap,
  _swigc__p_wxBoxSizer,