]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/src/gtk/_windows.py
fix building/running of tex2rtf
[wxWidgets.git] / wxPython / src / gtk / _windows.py
index 446d531b2ee0f2ef825fe9d8eb5e526d5ff3bc1a..0a8042fbd7390e3f9168e7ee1cf24898e14be17c 100644 (file)
@@ -106,8 +106,7 @@ class Panel(_core.Window):
         return _windows_.Panel_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Panel_swigregister = _windows_.Panel_swigregister
-Panel_swigregister(Panel)
+_windows_.Panel_swigregister(Panel)
 
 def PrePanel(*args, **kwargs):
     """PrePanel() -> Panel"""
@@ -271,8 +270,11 @@ class ScrolledWindow(Panel):
         return _windows_.ScrolledWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-ScrolledWindow_swigregister = _windows_.ScrolledWindow_swigregister
-ScrolledWindow_swigregister(ScrolledWindow)
+    ScaleX = property(GetScaleX,doc="See `GetScaleX`") 
+    ScaleY = property(GetScaleY,doc="See `GetScaleY`") 
+    TargetWindow = property(GetTargetWindow,SetTargetWindow,doc="See `GetTargetWindow` and `SetTargetWindow`") 
+    ViewStart = property(GetViewStart,doc="See `GetViewStart`") 
+_windows_.ScrolledWindow_swigregister(ScrolledWindow)
 
 def PreScrolledWindow(*args, **kwargs):
     """PreScrolledWindow() -> ScrolledWindow"""
@@ -322,10 +324,13 @@ FRAME_SHAPED = _windows_.FRAME_SHAPED
 FRAME_DRAWER = _windows_.FRAME_DRAWER
 FRAME_EX_METAL = _windows_.FRAME_EX_METAL
 DIALOG_EX_METAL = _windows_.DIALOG_EX_METAL
+WS_EX_CONTEXTHELP = _windows_.WS_EX_CONTEXTHELP
 DIALOG_MODAL = _windows_.DIALOG_MODAL
 DIALOG_MODELESS = _windows_.DIALOG_MODELESS
 USER_COLOURS = _windows_.USER_COLOURS
 NO_3D = _windows_.NO_3D
+FRAME_EX_CONTEXTHELP = _windows_.FRAME_EX_CONTEXTHELP
+DIALOG_EX_CONTEXTHELP = _windows_.DIALOG_EX_CONTEXTHELP
 FULLSCREEN_NOMENUBAR = _windows_.FULLSCREEN_NOMENUBAR
 FULLSCREEN_NOTOOLBAR = _windows_.FULLSCREEN_NOTOOLBAR
 FULLSCREEN_NOSTATUSBAR = _windows_.FULLSCREEN_NOSTATUSBAR
@@ -392,6 +397,10 @@ class TopLevelWindow(_core.Window):
         """GetTitle(self) -> String"""
         return _windows_.TopLevelWindow_GetTitle(*args, **kwargs)
 
+    def EnableCloseButton(*args, **kwargs):
+        """EnableCloseButton(self, bool enable) -> bool"""
+        return _windows_.TopLevelWindow_EnableCloseButton(*args, **kwargs)
+
     def SetShape(*args, **kwargs):
         """SetShape(self, Region region) -> bool"""
         return _windows_.TopLevelWindow_SetShape(*args, **kwargs)
@@ -421,8 +430,44 @@ class TopLevelWindow(_core.Window):
         return _windows_.TopLevelWindow_CenterOnScreen(*args, **kwargs)
 
     CentreOnScreen = CenterOnScreen 
-TopLevelWindow_swigregister = _windows_.TopLevelWindow_swigregister
-TopLevelWindow_swigregister(TopLevelWindow)
+    def GetDefaultItem(*args, **kwargs):
+        """
+        GetDefaultItem(self) -> Window
+
+        Get the default child of this parent, i.e. the one which is activated
+        by pressing <Enter> such as the OK button on a wx.Dialog.
+        """
+        return _windows_.TopLevelWindow_GetDefaultItem(*args, **kwargs)
+
+    def SetDefaultItem(*args, **kwargs):
+        """
+        SetDefaultItem(self, Window child) -> Window
+
+        Set this child as default, return the old default.
+        """
+        return _windows_.TopLevelWindow_SetDefaultItem(*args, **kwargs)
+
+    def SetTmpDefaultItem(*args, **kwargs):
+        """
+        SetTmpDefaultItem(self, Window win)
+
+        Set this child as temporary default
+        """
+        return _windows_.TopLevelWindow_SetTmpDefaultItem(*args, **kwargs)
+
+    def GetTmpDefaultItem(*args, **kwargs):
+        """
+        GetTmpDefaultItem(self) -> Window
+
+        Return the temporary default item, which can be None.
+        """
+        return _windows_.TopLevelWindow_GetTmpDefaultItem(*args, **kwargs)
+
+    DefaultItem = property(GetDefaultItem,SetDefaultItem,doc="See `GetDefaultItem` and `SetDefaultItem`") 
+    Icon = property(GetIcon,SetIcon,doc="See `GetIcon` and `SetIcon`") 
+    Title = property(GetTitle,SetTitle,doc="See `GetTitle` and `SetTitle`") 
+    TmpDefaultItem = property(GetTmpDefaultItem,SetTmpDefaultItem,doc="See `GetTmpDefaultItem` and `SetTmpDefaultItem`") 
+_windows_.TopLevelWindow_swigregister(TopLevelWindow)
 cvar = _windows_.cvar
 FrameNameStr = cvar.FrameNameStr
 DialogNameStr = cvar.DialogNameStr
@@ -546,8 +591,11 @@ class Frame(TopLevelWindow):
         return _windows_.Frame_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Frame_swigregister = _windows_.Frame_swigregister
-Frame_swigregister(Frame)
+    MenuBar = property(GetMenuBar,SetMenuBar,doc="See `GetMenuBar` and `SetMenuBar`") 
+    StatusBar = property(GetStatusBar,SetStatusBar,doc="See `GetStatusBar` and `SetStatusBar`") 
+    StatusBarPane = property(GetStatusBarPane,SetStatusBarPane,doc="See `GetStatusBarPane` and `SetStatusBarPane`") 
+    ToolBar = property(GetToolBar,SetToolBar,doc="See `GetToolBar` and `SetToolBar`") 
+_windows_.Frame_swigregister(Frame)
 
 def PreFrame(*args, **kwargs):
     """PreFrame() -> Frame"""
@@ -623,9 +671,16 @@ class Dialog(TopLevelWindow):
         """CreateTextSizer(self, String message) -> Sizer"""
         return _windows_.Dialog_CreateTextSizer(*args, **kwargs)
 
-    def CreateButtonSizer(*args, **kwargs):
-        """CreateButtonSizer(self, long flags, bool separated=False, int distance=0) -> Sizer"""
-        return _windows_.Dialog_CreateButtonSizer(*args, **kwargs)
+    def _CreateButtonSizer(*args, **kwargs):
+        """_CreateButtonSizer(self, long flags) -> Sizer"""
+        return _windows_.Dialog__CreateButtonSizer(*args, **kwargs)
+
+    def CreateButtonSizer(self, flags, *ignored):
+        return self._CreateButtonSizer(flags)
+
+    def CreateSeparatedButtonSizer(*args, **kwargs):
+        """CreateSeparatedButtonSizer(self, long flags) -> Sizer"""
+        return _windows_.Dialog_CreateSeparatedButtonSizer(*args, **kwargs)
 
     def CreateStdDialogButtonSizer(*args, **kwargs):
         """CreateStdDialogButtonSizer(self, long flags) -> StdDialogButtonSizer"""
@@ -661,8 +716,10 @@ class Dialog(TopLevelWindow):
         return _windows_.Dialog_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-Dialog_swigregister = _windows_.Dialog_swigregister
-Dialog_swigregister(Dialog)
+    AffirmativeId = property(GetAffirmativeId,SetAffirmativeId,doc="See `GetAffirmativeId` and `SetAffirmativeId`") 
+    EscapeId = property(GetEscapeId,SetEscapeId,doc="See `GetEscapeId` and `SetEscapeId`") 
+    ReturnCode = property(GetReturnCode,SetReturnCode,doc="See `GetReturnCode` and `SetReturnCode`") 
+_windows_.Dialog_swigregister(Dialog)
 
 def PreDialog(*args, **kwargs):
     """PreDialog() -> Dialog"""
@@ -688,6 +745,7 @@ def Dialog_GetClassDefaultAttributes(*args, **kwargs):
 
 #---------------------------------------------------------------------------
 
+DEFAULT_MINIFRAME_STYLE = _windows_.DEFAULT_MINIFRAME_STYLE
 class MiniFrame(Frame):
     """Proxy of C++ MiniFrame class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -696,7 +754,7 @@ class MiniFrame(Frame):
         """
         __init__(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> MiniFrame
+            long style=DEFAULT_MINIFRAME_STYLE, String name=FrameNameStr) -> MiniFrame
         """
         _windows_.MiniFrame_swiginit(self,_windows_.new_MiniFrame(*args, **kwargs))
         self._setOORInfo(self)
@@ -705,12 +763,11 @@ class MiniFrame(Frame):
         """
         Create(self, Window parent, int id=-1, String title=EmptyString, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
-            long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> bool
+            long style=DEFAULT_MINIFRAME_STYLE, String name=FrameNameStr) -> bool
         """
         return _windows_.MiniFrame_Create(*args, **kwargs)
 
-MiniFrame_swigregister = _windows_.MiniFrame_swigregister
-MiniFrame_swigregister(MiniFrame)
+_windows_.MiniFrame_swigregister(MiniFrame)
 
 def PreMiniFrame(*args, **kwargs):
     """PreMiniFrame() -> MiniFrame"""
@@ -744,8 +801,8 @@ class SplashScreenWindow(_core.Window):
         """GetBitmap(self) -> Bitmap"""
         return _windows_.SplashScreenWindow_GetBitmap(*args, **kwargs)
 
-SplashScreenWindow_swigregister = _windows_.SplashScreenWindow_swigregister
-SplashScreenWindow_swigregister(SplashScreenWindow)
+    Bitmap = property(GetBitmap,SetBitmap,doc="See `GetBitmap` and `SetBitmap`") 
+_windows_.SplashScreenWindow_swigregister(SplashScreenWindow)
 
 class SplashScreen(Frame):
     """Proxy of C++ SplashScreen class"""
@@ -772,8 +829,10 @@ class SplashScreen(Frame):
         """GetTimeout(self) -> int"""
         return _windows_.SplashScreen_GetTimeout(*args, **kwargs)
 
-SplashScreen_swigregister = _windows_.SplashScreen_swigregister
-SplashScreen_swigregister(SplashScreen)
+    SplashStyle = property(GetSplashStyle,doc="See `GetSplashStyle`") 
+    SplashWindow = property(GetSplashWindow,doc="See `GetSplashWindow`") 
+    Timeout = property(GetTimeout,doc="See `GetTimeout`") 
+_windows_.SplashScreen_swigregister(SplashScreen)
 
 #---------------------------------------------------------------------------
 
@@ -862,8 +921,23 @@ class StatusBar(_core.Window):
         return _windows_.StatusBar_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-StatusBar_swigregister = _windows_.StatusBar_swigregister
-StatusBar_swigregister(StatusBar)
+    def GetFields(self):
+        """Return a list of field values in the status bar. """
+        return [self.GetStatusText(i) for i in range(self.GetFieldsCount())]
+        
+    def SetFields(self, items):
+        """Set the values of the statusbar fields from a list of strings. """
+        self.SetFieldsCount(len(items))
+        for i in range(len(items)):
+            self.SetStatusText(items[i], i)
+
+    BorderX = property(GetBorderX,doc="See `GetBorderX`") 
+    BorderY = property(GetBorderY,doc="See `GetBorderY`") 
+    FieldRect = property(GetFieldRect,doc="See `GetFieldRect`") 
+    Fields = property(GetFields,SetFields,doc="See `GetFields` and `SetFields`") 
+    FieldsCount = property(GetFieldsCount,SetFieldsCount,doc="See `GetFieldsCount` and `SetFieldsCount`") 
+    StatusText = property(GetStatusText,SetStatusText,doc="See `GetStatusText` and `SetStatusText`") 
+_windows_.StatusBar_swigregister(StatusBar)
 
 def PreStatusBar(*args, **kwargs):
     """PreStatusBar() -> StatusBar"""
@@ -1186,8 +1260,16 @@ class SplitterWindow(_core.Window):
         return _windows_.SplitterWindow_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
-SplitterWindow_swigregister = _windows_.SplitterWindow_swigregister
-SplitterWindow_swigregister(SplitterWindow)
+    BorderSize = property(GetBorderSize,SetBorderSize,doc="See `GetBorderSize` and `SetBorderSize`") 
+    MinimumPaneSize = property(GetMinimumPaneSize,SetMinimumPaneSize,doc="See `GetMinimumPaneSize` and `SetMinimumPaneSize`") 
+    NeedUpdating = property(GetNeedUpdating,SetNeedUpdating,doc="See `GetNeedUpdating` and `SetNeedUpdating`") 
+    SashGravity = property(GetSashGravity,SetSashGravity,doc="See `GetSashGravity` and `SetSashGravity`") 
+    SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") 
+    SashSize = property(GetSashSize,SetSashSize,doc="See `GetSashSize` and `SetSashSize`") 
+    SplitMode = property(GetSplitMode,SetSplitMode,doc="See `GetSplitMode` and `SetSplitMode`") 
+    Window1 = property(GetWindow1,doc="See `GetWindow1`") 
+    Window2 = property(GetWindow2,doc="See `GetWindow2`") 
+_windows_.SplitterWindow_swigregister(SplitterWindow)
 SplitterNameStr = cvar.SplitterNameStr
 
 def PreSplitterWindow(*args, **kwargs):
@@ -1222,7 +1304,7 @@ class SplitterEvent(_core.NotifyEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -> SplitterEvent
+        __init__(self, EventType type=wxEVT_NULL, SplitterWindow splitter=(wxSplitterWindow *) NULL) -> SplitterEvent
 
         This class represents the events generated by a splitter control.
         """
@@ -1276,8 +1358,11 @@ class SplitterEvent(_core.NotifyEvent):
         """
         return _windows_.SplitterEvent_GetY(*args, **kwargs)
 
-SplitterEvent_swigregister = _windows_.SplitterEvent_swigregister
-SplitterEvent_swigregister(SplitterEvent)
+    SashPosition = property(GetSashPosition,SetSashPosition,doc="See `GetSashPosition` and `SetSashPosition`") 
+    WindowBeingRemoved = property(GetWindowBeingRemoved,doc="See `GetWindowBeingRemoved`") 
+    X = property(GetX,doc="See `GetX`") 
+    Y = property(GetY,doc="See `GetY`") 
+_windows_.SplitterEvent_swigregister(SplitterEvent)
 
 wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = _windows_.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
 wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = _windows_.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
@@ -1401,8 +1486,13 @@ class SashWindow(_core.Window):
         """SizeWindows(self)"""
         return _windows_.SashWindow_SizeWindows(*args, **kwargs)
 
-SashWindow_swigregister = _windows_.SashWindow_swigregister
-SashWindow_swigregister(SashWindow)
+    DefaultBorderSize = property(GetDefaultBorderSize,SetDefaultBorderSize,doc="See `GetDefaultBorderSize` and `SetDefaultBorderSize`") 
+    ExtraBorderSize = property(GetExtraBorderSize,SetExtraBorderSize,doc="See `GetExtraBorderSize` and `SetExtraBorderSize`") 
+    MaximumSizeX = property(GetMaximumSizeX,SetMaximumSizeX,doc="See `GetMaximumSizeX` and `SetMaximumSizeX`") 
+    MaximumSizeY = property(GetMaximumSizeY,SetMaximumSizeY,doc="See `GetMaximumSizeY` and `SetMaximumSizeY`") 
+    MinimumSizeX = property(GetMinimumSizeX,SetMinimumSizeX,doc="See `GetMinimumSizeX` and `SetMinimumSizeX`") 
+    MinimumSizeY = property(GetMinimumSizeY,SetMinimumSizeY,doc="See `GetMinimumSizeY` and `SetMinimumSizeY`") 
+_windows_.SashWindow_swigregister(SashWindow)
 SashNameStr = cvar.SashNameStr
 SashLayoutNameStr = cvar.SashLayoutNameStr
 
@@ -1444,8 +1534,10 @@ class SashEvent(_core.CommandEvent):
         """GetDragStatus(self) -> int"""
         return _windows_.SashEvent_GetDragStatus(*args, **kwargs)
 
-SashEvent_swigregister = _windows_.SashEvent_swigregister
-SashEvent_swigregister(SashEvent)
+    DragRect = property(GetDragRect,SetDragRect,doc="See `GetDragRect` and `SetDragRect`") 
+    DragStatus = property(GetDragStatus,SetDragStatus,doc="See `GetDragStatus` and `SetDragStatus`") 
+    Edge = property(GetEdge,SetEdge,doc="See `GetEdge` and `SetEdge`") 
+_windows_.SashEvent_swigregister(SashEvent)
 
 wxEVT_SASH_DRAGGED = _windows_.wxEVT_SASH_DRAGGED
 EVT_SASH_DRAGGED = wx.PyEventBinder( wxEVT_SASH_DRAGGED, 1 )
@@ -1513,8 +1605,12 @@ class QueryLayoutInfoEvent(_core.Event):
         """GetAlignment(self) -> int"""
         return _windows_.QueryLayoutInfoEvent_GetAlignment(*args, **kwargs)
 
-QueryLayoutInfoEvent_swigregister = _windows_.QueryLayoutInfoEvent_swigregister
-QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEvent)
+    Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") 
+    Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
+    Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") 
+    RequestedLength = property(GetRequestedLength,SetRequestedLength,doc="See `GetRequestedLength` and `SetRequestedLength`") 
+    Size = property(GetSize,SetSize,doc="See `GetSize` and `SetSize`") 
+_windows_.QueryLayoutInfoEvent_swigregister(QueryLayoutInfoEvent)
 
 class CalculateLayoutEvent(_core.Event):
     """Proxy of C++ CalculateLayoutEvent class"""
@@ -1539,8 +1635,9 @@ class CalculateLayoutEvent(_core.Event):
         """GetRect(self) -> Rect"""
         return _windows_.CalculateLayoutEvent_GetRect(*args, **kwargs)
 
-CalculateLayoutEvent_swigregister = _windows_.CalculateLayoutEvent_swigregister
-CalculateLayoutEvent_swigregister(CalculateLayoutEvent)
+    Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
+    Rect = property(GetRect,SetRect,doc="See `GetRect` and `SetRect`") 
+_windows_.CalculateLayoutEvent_swigregister(CalculateLayoutEvent)
 
 EVT_QUERY_LAYOUT_INFO = wx.PyEventBinder( wxEVT_QUERY_LAYOUT_INFO )
 EVT_CALCULATE_LAYOUT = wx.PyEventBinder( wxEVT_CALCULATE_LAYOUT )
@@ -1586,8 +1683,9 @@ class SashLayoutWindow(SashWindow):
         """SetOrientation(self, int orientation)"""
         return _windows_.SashLayoutWindow_SetOrientation(*args, **kwargs)
 
-SashLayoutWindow_swigregister = _windows_.SashLayoutWindow_swigregister
-SashLayoutWindow_swigregister(SashLayoutWindow)
+    Alignment = property(GetAlignment,SetAlignment,doc="See `GetAlignment` and `SetAlignment`") 
+    Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") 
+_windows_.SashLayoutWindow_swigregister(SashLayoutWindow)
 
 def PreSashLayoutWindow(*args, **kwargs):
     """PreSashLayoutWindow() -> SashLayoutWindow"""
@@ -1615,8 +1713,7 @@ class LayoutAlgorithm(_core.Object):
         """LayoutWindow(self, Window parent, Window mainWindow=None) -> bool"""
         return _windows_.LayoutAlgorithm_LayoutWindow(*args, **kwargs)
 
-LayoutAlgorithm_swigregister = _windows_.LayoutAlgorithm_swigregister
-LayoutAlgorithm_swigregister(LayoutAlgorithm)
+_windows_.LayoutAlgorithm_swigregister(LayoutAlgorithm)
 
 #---------------------------------------------------------------------------
 
@@ -1637,8 +1734,7 @@ class PopupWindow(_core.Window):
         """Position(self, Point ptOrigin, Size size)"""
         return _windows_.PopupWindow_Position(*args, **kwargs)
 
-PopupWindow_swigregister = _windows_.PopupWindow_swigregister
-PopupWindow_swigregister(PopupWindow)
+_windows_.PopupWindow_swigregister(PopupWindow)
 
 def PrePopupWindow(*args, **kwargs):
     """PrePopupWindow() -> PopupWindow"""
@@ -1654,7 +1750,7 @@ class PopupTransientWindow(PopupWindow):
     def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, int style=BORDER_NONE) -> PopupTransientWindow"""
         _windows_.PopupTransientWindow_swiginit(self,_windows_.new_PopupTransientWindow(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, PopupTransientWindow)
+        self._setOORInfo(self);PopupTransientWindow._setCallbackInfo(self, self, PopupTransientWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1668,8 +1764,7 @@ class PopupTransientWindow(PopupWindow):
         """Dismiss(self)"""
         return _windows_.PopupTransientWindow_Dismiss(*args, **kwargs)
 
-PopupTransientWindow_swigregister = _windows_.PopupTransientWindow_swigregister
-PopupTransientWindow_swigregister(PopupTransientWindow)
+_windows_.PopupTransientWindow_swigregister(PopupTransientWindow)
 
 def PrePopupTransientWindow(*args, **kwargs):
     """PrePopupTransientWindow() -> PopupTransientWindow"""
@@ -1702,8 +1797,7 @@ class TipWindow(PopupTransientWindow):
         """
         return _windows_.TipWindow_Close(*args, **kwargs)
 
-TipWindow_swigregister = _windows_.TipWindow_swigregister
-TipWindow_swigregister(TipWindow)
+_windows_.TipWindow_swigregister(TipWindow)
 
 #---------------------------------------------------------------------------
 
@@ -1717,7 +1811,7 @@ class VScrolledWindow(Panel):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> VScrolledWindow
         """
         _windows_.VScrolledWindow_swiginit(self,_windows_.new_VScrolledWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, VScrolledWindow)
+        self._setOORInfo(self);VScrolledWindow._setCallbackInfo(self, self, VScrolledWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1798,8 +1892,12 @@ class VScrolledWindow(Panel):
         """GetLinesHeight(self, size_t lineMin, size_t lineMax) -> int"""
         return _windows_.VScrolledWindow_GetLinesHeight(*args, **kwargs)
 
-VScrolledWindow_swigregister = _windows_.VScrolledWindow_swigregister
-VScrolledWindow_swigregister(VScrolledWindow)
+    FirstVisibleLine = property(GetFirstVisibleLine,doc="See `GetFirstVisibleLine`") 
+    LastVisibleLine = property(GetLastVisibleLine,doc="See `GetLastVisibleLine`") 
+    LineCount = property(GetLineCount,SetLineCount,doc="See `GetLineCount` and `SetLineCount`") 
+    VisibleBegin = property(GetVisibleBegin,doc="See `GetVisibleBegin`") 
+    VisibleEnd = property(GetVisibleEnd,doc="See `GetVisibleEnd`") 
+_windows_.VScrolledWindow_swigregister(VScrolledWindow)
 
 def PreVScrolledWindow(*args, **kwargs):
     """PreVScrolledWindow() -> VScrolledWindow"""
@@ -1816,7 +1914,7 @@ class VListBox(VScrolledWindow):
             Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> VListBox
         """
         _windows_.VListBox_swiginit(self,_windows_.new_VListBox(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, VListBox)
+        self._setOORInfo(self);VListBox._setCallbackInfo(self, self, VListBox)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1921,8 +2019,13 @@ class VListBox(VScrolledWindow):
         """OnDrawBackground(self, DC dc, Rect rect, size_t n)"""
         return _windows_.VListBox_OnDrawBackground(*args, **kwargs)
 
-VListBox_swigregister = _windows_.VListBox_swigregister
-VListBox_swigregister(VListBox)
+    FirstSelected = property(GetFirstSelected,doc="See `GetFirstSelected`") 
+    ItemCount = property(GetItemCount,SetItemCount,doc="See `GetItemCount` and `SetItemCount`") 
+    Margins = property(GetMargins,SetMargins,doc="See `GetMargins` and `SetMargins`") 
+    SelectedCount = property(GetSelectedCount,doc="See `GetSelectedCount`") 
+    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
+    SelectionBackground = property(GetSelectionBackground,SetSelectionBackground,doc="See `GetSelectionBackground` and `SetSelectionBackground`") 
+_windows_.VListBox_swigregister(VListBox)
 VListBoxNameStr = cvar.VListBoxNameStr
 
 def PreVListBox(*args, **kwargs):
@@ -1940,7 +2043,7 @@ class HtmlListBox(VListBox):
             Size size=DefaultSize, long style=0, String name=VListBoxNameStr) -> HtmlListBox
         """
         _windows_.HtmlListBox_swiginit(self,_windows_.new_HtmlListBox(*args, **kwargs))
-        self._setOORInfo(self);self._setCallbackInfo(self, HtmlListBox)
+        self._setOORInfo(self);HtmlListBox._setCallbackInfo(self, self, HtmlListBox)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -1965,14 +2068,49 @@ class HtmlListBox(VListBox):
         """OnLinkClicked(self, size_t n, wxHtmlLinkInfo link)"""
         return _windows_.HtmlListBox_OnLinkClicked(*args, **kwargs)
 
-HtmlListBox_swigregister = _windows_.HtmlListBox_swigregister
-HtmlListBox_swigregister(HtmlListBox)
+    FileSystem = property(GetFileSystem,doc="See `GetFileSystem`") 
+_windows_.HtmlListBox_swigregister(HtmlListBox)
 
 def PreHtmlListBox(*args, **kwargs):
     """PreHtmlListBox() -> HtmlListBox"""
     val = _windows_.new_PreHtmlListBox(*args, **kwargs)
     return val
 
+HLB_DEFAULT_STYLE = _windows_.HLB_DEFAULT_STYLE
+HLB_MULTIPLE = _windows_.HLB_MULTIPLE
+class SimpleHtmlListBox(HtmlListBox,_core.ItemContainer):
+    """Proxy of C++ SimpleHtmlListBox 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, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+            long style=HLB_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=SimpleHtmlListBoxNameStr) -> SimpleHtmlListBox
+        """
+        _windows_.SimpleHtmlListBox_swiginit(self,_windows_.new_SimpleHtmlListBox(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=-1, Point pos=DefaultPosition, 
+            Size size=DefaultSize, wxArrayString choices=wxPyEmptyStringArray, 
+            long style=HLB_DEFAULT_STYLE, 
+            Validator validator=DefaultValidator, 
+            String name=SimpleHtmlListBoxNameStr) -> bool
+        """
+        return _windows_.SimpleHtmlListBox_Create(*args, **kwargs)
+
+_windows_.SimpleHtmlListBox_swigregister(SimpleHtmlListBox)
+SimpleHtmlListBoxNameStr = cvar.SimpleHtmlListBoxNameStr
+
+def PreSimpleHtmlListBox(*args, **kwargs):
+    """PreSimpleHtmlListBox() -> SimpleHtmlListBox"""
+    val = _windows_.new_PreSimpleHtmlListBox(*args, **kwargs)
+    return val
+
 #---------------------------------------------------------------------------
 
 class TaskBarIcon(_core.EvtHandler):
@@ -1982,12 +2120,12 @@ class TaskBarIcon(_core.EvtHandler):
     def __init__(self, *args, **kwargs): 
         """__init__(self) -> TaskBarIcon"""
         _windows_.TaskBarIcon_swiginit(self,_windows_.new_TaskBarIcon(*args, **kwargs))
-        self._setCallbackInfo(self, TaskBarIcon, 0)
+        TaskBarIcon._setCallbackInfo(self, self, TaskBarIcon)
 
     __swig_destroy__ = _windows_.delete_TaskBarIcon
     __del__ = lambda self : None;
     def _setCallbackInfo(*args, **kwargs):
-        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref)"""
+        """_setCallbackInfo(self, PyObject self, PyObject _class, int incref=0)"""
         return _windows_.TaskBarIcon__setCallbackInfo(*args, **kwargs)
 
     def Destroy(*args, **kwargs):
@@ -1996,9 +2134,8 @@ class TaskBarIcon(_core.EvtHandler):
 
         Deletes the C++ object this Python object is a proxy for.
         """
-        val = _windows_.TaskBarIcon_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _windows_.TaskBarIcon_Destroy(*args, **kwargs)
 
     def IsOk(*args, **kwargs):
         """IsOk(self) -> bool"""
@@ -2021,18 +2158,16 @@ class TaskBarIcon(_core.EvtHandler):
         """PopupMenu(self, Menu menu) -> bool"""
         return _windows_.TaskBarIcon_PopupMenu(*args, **kwargs)
 
-TaskBarIcon_swigregister = _windows_.TaskBarIcon_swigregister
-TaskBarIcon_swigregister(TaskBarIcon)
+_windows_.TaskBarIcon_swigregister(TaskBarIcon)
 
 class TaskBarIconEvent(_core.Event):
     """Proxy of C++ TaskBarIconEvent 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, wxEventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent"""
+        """__init__(self, EventType evtType, wxTaskBarIcon tbIcon) -> TaskBarIconEvent"""
         _windows_.TaskBarIconEvent_swiginit(self,_windows_.new_TaskBarIconEvent(*args, **kwargs))
-TaskBarIconEvent_swigregister = _windows_.TaskBarIconEvent_swigregister
-TaskBarIconEvent_swigregister(TaskBarIconEvent)
+_windows_.TaskBarIconEvent_swigregister(TaskBarIconEvent)
 
 wxEVT_TASKBAR_MOVE = _windows_.wxEVT_TASKBAR_MOVE
 wxEVT_TASKBAR_LEFT_DOWN = _windows_.wxEVT_TASKBAR_LEFT_DOWN
@@ -2124,8 +2259,10 @@ class ColourData(_core.Object):
         """
         return _windows_.ColourData_SetCustomColour(*args, **kwargs)
 
-ColourData_swigregister = _windows_.ColourData_swigregister
-ColourData_swigregister(ColourData)
+    ChooseFull = property(GetChooseFull,SetChooseFull,doc="See `GetChooseFull` and `SetChooseFull`") 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
+    CustomColour = property(GetCustomColour,SetCustomColour,doc="See `GetCustomColour` and `SetCustomColour`") 
+_windows_.ColourData_swigregister(ColourData)
 FileSelectorPromptStr = cvar.FileSelectorPromptStr
 DirSelectorPromptStr = cvar.DirSelectorPromptStr
 DirDialogNameStr = cvar.DirDialogNameStr
@@ -2156,8 +2293,8 @@ class ColourDialog(Dialog):
         """
         return _windows_.ColourDialog_GetColourData(*args, **kwargs)
 
-ColourDialog_swigregister = _windows_.ColourDialog_swigregister
-ColourDialog_swigregister(ColourDialog)
+    ColourData = property(GetColourData,doc="See `GetColourData`") 
+_windows_.ColourDialog_swigregister(ColourDialog)
 
 
 def GetColourFromUser(*args, **kwargs):
@@ -2166,6 +2303,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
@@ -2176,7 +2316,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
 
@@ -2185,15 +2325,6 @@ class DirDialog(Dialog):
         _windows_.DirDialog_swiginit(self,_windows_.new_DirDialog(*args, **kwargs))
         self._setOORInfo(self)
 
-    def Create(*args, **kwargs):
-        """
-        Create(self, Window parent, String title=wxDirSelectorPromptStr, 
-            String defaultPath=wxEmptyString, long style=DD_DEFAULT_STYLE, 
-            Point pos=DefaultPosition, 
-            Size sz=DefaultSize, String name=DirDialogNameStr) -> bool
-        """
-        return _windows_.DirDialog_Create(*args, **kwargs)
-
     def GetPath(*args, **kwargs):
         """
         GetPath(self) -> String
@@ -2226,19 +2357,25 @@ class DirDialog(Dialog):
         """
         return _windows_.DirDialog_SetPath(*args, **kwargs)
 
-DirDialog_swigregister = _windows_.DirDialog_swigregister
-DirDialog_swigregister(DirDialog)
-
-def PreDirDialog(*args, **kwargs):
-    """
-    PreDirDialog() -> DirDialog
-
-    wx.DirDialog allows the user to select a directory by browising the
-    file system.
-    """
-    val = _windows_.new_PreDirDialog(*args, **kwargs)
-    return val
-
+    Message = property(GetMessage,SetMessage,doc="See `GetMessage` and `SetMessage`") 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+_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
+HIDE_READONLY = _windows_.HIDE_READONLY
+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_PREVIEW = _windows_.FD_PREVIEW
+FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE
 class FileDialog(Dialog):
     """
     wx.FileDialog allows the user to select one or more files from the
@@ -2251,7 +2388,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.
         """
@@ -2303,14 +2441,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)
@@ -2359,14 +2489,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
@@ -2398,8 +2520,15 @@ class FileDialog(Dialog):
         """
         return _windows_.FileDialog_GetPaths(*args, **kwargs)
 
-FileDialog_swigregister = _windows_.FileDialog_swigregister
-FileDialog_swigregister(FileDialog)
+    Directory = property(GetDirectory,SetDirectory,doc="See `GetDirectory` and `SetDirectory`") 
+    Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") 
+    Filenames = property(GetFilenames,doc="See `GetFilenames`") 
+    FilterIndex = property(GetFilterIndex,SetFilterIndex,doc="See `GetFilterIndex` and `SetFilterIndex`") 
+    Message = property(GetMessage,SetMessage,doc="See `GetMessage` and `SetMessage`") 
+    Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
+    Paths = property(GetPaths,doc="See `GetPaths`") 
+    Wildcard = property(GetWildcard,SetWildcard,doc="See `GetWildcard` and `SetWildcard`") 
+_windows_.FileDialog_swigregister(FileDialog)
 
 CHOICEDLG_STYLE = _windows_.CHOICEDLG_STYLE
 class MultiChoiceDialog(Dialog):
@@ -2447,8 +2576,8 @@ class MultiChoiceDialog(Dialog):
         """
         return _windows_.MultiChoiceDialog_GetSelections(*args, **kwargs)
 
-MultiChoiceDialog_swigregister = _windows_.MultiChoiceDialog_swigregister
-MultiChoiceDialog_swigregister(MultiChoiceDialog)
+    Selections = property(GetSelections,SetSelections,doc="See `GetSelections` and `SetSelections`") 
+_windows_.MultiChoiceDialog_swigregister(MultiChoiceDialog)
 
 class SingleChoiceDialog(Dialog):
     """A simple dialog with a single selection listbox."""
@@ -2469,7 +2598,7 @@ class SingleChoiceDialog(Dialog):
         """
         GetSelection(self) -> int
 
-        Get the index of teh currently selected item.
+        Get the index of the currently selected item.
         """
         return _windows_.SingleChoiceDialog_GetSelection(*args, **kwargs)
 
@@ -2489,8 +2618,9 @@ class SingleChoiceDialog(Dialog):
         """
         return _windows_.SingleChoiceDialog_SetSelection(*args, **kwargs)
 
-SingleChoiceDialog_swigregister = _windows_.SingleChoiceDialog_swigregister
-SingleChoiceDialog_swigregister(SingleChoiceDialog)
+    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
+    StringSelection = property(GetStringSelection,doc="See `GetStringSelection`") 
+_windows_.SingleChoiceDialog_swigregister(SingleChoiceDialog)
 
 TextEntryDialogStyle = _windows_.TextEntryDialogStyle
 class TextEntryDialog(Dialog):
@@ -2525,8 +2655,8 @@ class TextEntryDialog(Dialog):
         """
         return _windows_.TextEntryDialog_SetValue(*args, **kwargs)
 
-TextEntryDialog_swigregister = _windows_.TextEntryDialog_swigregister
-TextEntryDialog_swigregister(TextEntryDialog)
+    Value = property(GetValue,SetValue,doc="See `GetValue` and `SetValue`") 
+_windows_.TextEntryDialog_swigregister(TextEntryDialog)
 
 class PasswordEntryDialog(TextEntryDialog):
     """Proxy of C++ PasswordEntryDialog class"""
@@ -2539,10 +2669,30 @@ class PasswordEntryDialog(TextEntryDialog):
             long style=TextEntryDialogStyle, Point pos=DefaultPosition) -> PasswordEntryDialog
         """
         _windows_.PasswordEntryDialog_swiginit(self,_windows_.new_PasswordEntryDialog(*args, **kwargs))
-PasswordEntryDialog_swigregister = _windows_.PasswordEntryDialog_swigregister
-PasswordEntryDialog_swigregister(PasswordEntryDialog)
+_windows_.PasswordEntryDialog_swigregister(PasswordEntryDialog)
 GetPasswordFromUserPromptStr = cvar.GetPasswordFromUserPromptStr
 
+class NumberEntryDialog(Dialog):
+    """A dialog with spin control, ok and cancel buttons."""
+    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, String message, String prompt, String caption, 
+            long value, long min, long max, Point pos=DefaultPosition) -> NumberEntryDialog
+
+        Constructor.  Use ShowModal method to show the dialog.
+        """
+        _windows_.NumberEntryDialog_swiginit(self,_windows_.new_NumberEntryDialog(*args, **kwargs))
+        self._setOORInfo(self)
+
+    def GetValue(*args, **kwargs):
+        """GetValue(self) -> long"""
+        return _windows_.NumberEntryDialog_GetValue(*args, **kwargs)
+
+    Value = property(GetValue,doc="See `GetValue`") 
+_windows_.NumberEntryDialog_swigregister(NumberEntryDialog)
+
 class FontData(_core.Object):
     """
     This class holds a variety of information related to font dialogs and
@@ -2676,8 +2826,12 @@ class FontData(_core.Object):
         """
         return _windows_.FontData_SetShowHelp(*args, **kwargs)
 
-FontData_swigregister = _windows_.FontData_swigregister
-FontData_swigregister(FontData)
+    AllowSymbols = property(GetAllowSymbols,SetAllowSymbols,doc="See `GetAllowSymbols` and `SetAllowSymbols`") 
+    ChosenFont = property(GetChosenFont,SetChosenFont,doc="See `GetChosenFont` and `SetChosenFont`") 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
+    InitialFont = property(GetInitialFont,SetInitialFont,doc="See `GetInitialFont` and `SetInitialFont`") 
+    ShowHelp = property(GetShowHelp,SetShowHelp,doc="See `GetShowHelp` and `SetShowHelp`") 
+_windows_.FontData_swigregister(FontData)
 
 class FontDialog(Dialog):
     """
@@ -2709,8 +2863,8 @@ class FontDialog(Dialog):
         """
         return _windows_.FontDialog_GetFontData(*args, **kwargs)
 
-FontDialog_swigregister = _windows_.FontDialog_swigregister
-FontDialog_swigregister(FontDialog)
+    FontData = property(GetFontData,doc="See `GetFontData`") 
+_windows_.FontDialog_swigregister(FontDialog)
 
 
 def GetFontFromUser(*args, **kwargs):
@@ -2734,9 +2888,16 @@ class MessageDialog(Dialog):
         _windows_.MessageDialog_swiginit(self,_windows_.new_MessageDialog(*args, **kwargs))
         self._setOORInfo(self)
 
-MessageDialog_swigregister = _windows_.MessageDialog_swigregister
-MessageDialog_swigregister(MessageDialog)
+_windows_.MessageDialog_swigregister(MessageDialog)
 
+PD_AUTO_HIDE = _windows_.PD_AUTO_HIDE
+PD_APP_MODAL = _windows_.PD_APP_MODAL
+PD_CAN_ABORT = _windows_.PD_CAN_ABORT
+PD_ELAPSED_TIME = _windows_.PD_ELAPSED_TIME
+PD_ESTIMATED_TIME = _windows_.PD_ESTIMATED_TIME
+PD_REMAINING_TIME = _windows_.PD_REMAINING_TIME
+PD_SMOOTH = _windows_.PD_SMOOTH
+PD_CAN_SKIP = _windows_.PD_CAN_SKIP
 class ProgressDialog(Frame):
     """
     A dialog that shows a short message and a progress bar. Optionally, it
@@ -2768,13 +2929,24 @@ class ProgressDialog(Frame):
         unless the Cancel button has been pressed, and ``skip`` is ``False``
         unless the Skip button (if any) has been pressed.
 
-        If the ``continue`` return value is ``false``, the application can either
+        If the ``continue`` return value is ``False``, the application can either
         immediately destroy the dialog or ask the user for confirmation, and if the
         abort is not confirmed the dialog may be resumed with `Resume` function.
 
         """
         return _windows_.ProgressDialog_Update(*args, **kwargs)
 
+    def Pulse(*args, **kwargs):
+        """
+        Pulse(self, String newmsg) --> (continue, skip)
+
+        Just like `Update` but switches the dialog to use a gauge in
+        interminante mode and calls `wx.Gauge.Pulse` to show the user a bit of
+        progress.
+        """
+        return _windows_.ProgressDialog_Pulse(*args, **kwargs)
+
+    UpdatePulse =  Pulse 
     def Resume(*args, **kwargs):
         """
         Resume(self)
@@ -2784,8 +2956,7 @@ class ProgressDialog(Frame):
         """
         return _windows_.ProgressDialog_Resume(*args, **kwargs)
 
-ProgressDialog_swigregister = _windows_.ProgressDialog_swigregister
-ProgressDialog_swigregister(ProgressDialog)
+_windows_.ProgressDialog_swigregister(ProgressDialog)
 
 FR_DOWN = _windows_.FR_DOWN
 FR_WHOLEWORD = _windows_.FR_WHOLEWORD
@@ -2806,11 +2977,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"""
@@ -2818,7 +2989,7 @@ class FindDialogEvent(_core.CommandEvent):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, wxEventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent
+        __init__(self, EventType commandType=wxEVT_NULL, int id=0) -> FindDialogEvent
 
         Events for the FindReplaceDialog
         """
@@ -2869,8 +3040,11 @@ class FindDialogEvent(_core.CommandEvent):
         """SetReplaceString(self, String str)"""
         return _windows_.FindDialogEvent_SetReplaceString(*args, **kwargs)
 
-FindDialogEvent_swigregister = _windows_.FindDialogEvent_swigregister
-FindDialogEvent_swigregister(FindDialogEvent)
+    Dialog = property(GetDialog,doc="See `GetDialog`") 
+    FindString = property(GetFindString,SetFindString,doc="See `GetFindString` and `SetFindString`") 
+    Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
+    ReplaceString = property(GetReplaceString,SetReplaceString,doc="See `GetReplaceString` and `SetReplaceString`") 
+_windows_.FindDialogEvent_swigregister(FindDialogEvent)
 
 class FindReplaceData(_core.Object):
     """
@@ -2942,8 +3116,10 @@ class FindReplaceData(_core.Object):
         """
         return _windows_.FindReplaceData_SetReplaceString(*args, **kwargs)
 
-FindReplaceData_swigregister = _windows_.FindReplaceData_swigregister
-FindReplaceData_swigregister(FindReplaceData)
+    FindString = property(GetFindString,SetFindString,doc="See `GetFindString` and `SetFindString`") 
+    Flags = property(GetFlags,SetFlags,doc="See `GetFlags` and `SetFlags`") 
+    ReplaceString = property(GetReplaceString,SetReplaceString,doc="See `GetReplaceString` and `SetReplaceString`") 
+_windows_.FindReplaceData_swigregister(FindReplaceData)
 
 class FindReplaceDialog(Dialog):
     """
@@ -2993,8 +3169,8 @@ class FindReplaceDialog(Dialog):
         """
         return _windows_.FindReplaceDialog_SetData(*args, **kwargs)
 
-FindReplaceDialog_swigregister = _windows_.FindReplaceDialog_swigregister
-FindReplaceDialog_swigregister(FindReplaceDialog)
+    Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
+_windows_.FindReplaceDialog_swigregister(FindReplaceDialog)
 
 def PreFindReplaceDialog(*args, **kwargs):
     """
@@ -3063,16 +3239,13 @@ class MDIParentFrame(Frame):
         """GetClientWindow(self) -> MDIClientWindow"""
         return _windows_.MDIParentFrame_GetClientWindow(*args, **kwargs)
 
-    def GetToolBar(*args, **kwargs):
-        """GetToolBar(self) -> Window"""
-        return _windows_.MDIParentFrame_GetToolBar(*args, **kwargs)
-
     def Tile(*args, **kwargs):
         """Tile(self, int orient=HORIZONTAL)"""
         return _windows_.MDIParentFrame_Tile(*args, **kwargs)
 
-MDIParentFrame_swigregister = _windows_.MDIParentFrame_swigregister
-MDIParentFrame_swigregister(MDIParentFrame)
+    ActiveChild = property(GetActiveChild,doc="See `GetActiveChild`") 
+    ClientWindow = property(GetClientWindow,doc="See `GetClientWindow`") 
+_windows_.MDIParentFrame_swigregister(MDIParentFrame)
 
 def PreMDIParentFrame(*args, **kwargs):
     """PreMDIParentFrame() -> MDIParentFrame"""
@@ -3106,8 +3279,7 @@ class MDIChildFrame(Frame):
         """Activate(self)"""
         return _windows_.MDIChildFrame_Activate(*args, **kwargs)
 
-MDIChildFrame_swigregister = _windows_.MDIChildFrame_swigregister
-MDIChildFrame_swigregister(MDIChildFrame)
+_windows_.MDIChildFrame_swigregister(MDIChildFrame)
 
 def PreMDIChildFrame(*args, **kwargs):
     """PreMDIChildFrame() -> MDIChildFrame"""
@@ -3127,8 +3299,7 @@ class MDIClientWindow(_core.Window):
         """Create(self, MDIParentFrame parent, long style=0) -> bool"""
         return _windows_.MDIClientWindow_Create(*args, **kwargs)
 
-MDIClientWindow_swigregister = _windows_.MDIClientWindow_swigregister
-MDIClientWindow_swigregister(MDIClientWindow)
+_windows_.MDIClientWindow_swigregister(MDIClientWindow)
 
 def PreMDIClientWindow(*args, **kwargs):
     """PreMDIClientWindow() -> MDIClientWindow"""
@@ -3147,16 +3318,13 @@ class PyWindow(_core.Window):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyWindow
         """
         _windows_.PyWindow_swiginit(self,_windows_.new_PyWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyWindow)
+        self._setOORInfo(self);PyWindow._setCallbackInfo(self, self, PyWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyWindow__setCallbackInfo(*args, **kwargs)
 
-    def SetBestSize(*args, **kwargs):
-        """SetBestSize(self, Size size)"""
-        return _windows_.PyWindow_SetBestSize(*args, **kwargs)
-
+    SetBestSize = wx.Window.SetInitialSize 
     def DoEraseBackground(*args, **kwargs):
         """DoEraseBackground(self, DC dc) -> bool"""
         return _windows_.PyWindow_DoEraseBackground(*args, **kwargs)
@@ -3310,8 +3478,7 @@ class PyWindow(_core.Window):
     base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
                                    "Please use PyWindow.OnInternalIdle instead.")
 
-PyWindow_swigregister = _windows_.PyWindow_swigregister
-PyWindow_swigregister(PyWindow)
+_windows_.PyWindow_swigregister(PyWindow)
 
 def PrePyWindow(*args, **kwargs):
     """PrePyWindow() -> PyWindow"""
@@ -3328,16 +3495,13 @@ class PyPanel(Panel):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyPanel
         """
         _windows_.PyPanel_swiginit(self,_windows_.new_PyPanel(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyPanel)
+        self._setOORInfo(self);PyPanel._setCallbackInfo(self, self, PyPanel)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyPanel__setCallbackInfo(*args, **kwargs)
 
-    def SetBestSize(*args, **kwargs):
-        """SetBestSize(self, Size size)"""
-        return _windows_.PyPanel_SetBestSize(*args, **kwargs)
-
+    SetBestSize = wx.Window.SetInitialSize 
     def DoEraseBackground(*args, **kwargs):
         """DoEraseBackground(self, DC dc) -> bool"""
         return _windows_.PyPanel_DoEraseBackground(*args, **kwargs)
@@ -3491,8 +3655,7 @@ class PyPanel(Panel):
     base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
                                    "Please use PyPanel.OnInternalIdle instead.")
 
-PyPanel_swigregister = _windows_.PyPanel_swigregister
-PyPanel_swigregister(PyPanel)
+_windows_.PyPanel_swigregister(PyPanel)
 
 def PrePyPanel(*args, **kwargs):
     """PrePyPanel() -> PyPanel"""
@@ -3509,16 +3672,13 @@ class PyScrolledWindow(ScrolledWindow):
             Size size=DefaultSize, long style=0, String name=PanelNameStr) -> PyScrolledWindow
         """
         _windows_.PyScrolledWindow_swiginit(self,_windows_.new_PyScrolledWindow(*args, **kwargs))
-        self._setOORInfo(self); self._setCallbackInfo(self, PyScrolledWindow)
+        self._setOORInfo(self);PyScrolledWindow._setCallbackInfo(self, self, PyScrolledWindow)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _windows_.PyScrolledWindow__setCallbackInfo(*args, **kwargs)
 
-    def SetBestSize(*args, **kwargs):
-        """SetBestSize(self, Size size)"""
-        return _windows_.PyScrolledWindow_SetBestSize(*args, **kwargs)
-
+    SetBestSize = wx.Window.SetInitialSize 
     def DoEraseBackground(*args, **kwargs):
         """DoEraseBackground(self, DC dc) -> bool"""
         return _windows_.PyScrolledWindow_DoEraseBackground(*args, **kwargs)
@@ -3672,8 +3832,7 @@ class PyScrolledWindow(ScrolledWindow):
     base_OnInternalIdle = wx._deprecated(base_OnInternalIdle,
                                    "Please use PyScrolledWindow.OnInternalIdle instead.")
 
-PyScrolledWindow_swigregister = _windows_.PyScrolledWindow_swigregister
-PyScrolledWindow_swigregister(PyScrolledWindow)
+_windows_.PyScrolledWindow_swigregister(PyScrolledWindow)
 
 def PrePyScrolledWindow(*args, **kwargs):
     """PrePyScrolledWindow() -> PyScrolledWindow"""
@@ -3726,10 +3885,15 @@ class PrintData(_core.Object):
         """GetOrientation(self) -> int"""
         return _windows_.PrintData_GetOrientation(*args, **kwargs)
 
-    def Ok(*args, **kwargs):
-        """Ok(self) -> bool"""
-        return _windows_.PrintData_Ok(*args, **kwargs)
+    def IsOrientationReversed(*args, **kwargs):
+        """IsOrientationReversed(self) -> bool"""
+        return _windows_.PrintData_IsOrientationReversed(*args, **kwargs)
+
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _windows_.PrintData_IsOk(*args, **kwargs)
 
+    Ok = IsOk 
     def GetPrinterName(*args, **kwargs):
         """GetPrinterName(self) -> String"""
         return _windows_.PrintData_GetPrinterName(*args, **kwargs)
@@ -3762,6 +3926,10 @@ class PrintData(_core.Object):
         """GetPrintMode(self) -> int"""
         return _windows_.PrintData_GetPrintMode(*args, **kwargs)
 
+    def GetMedia(*args, **kwargs):
+        """GetMedia(self) -> int"""
+        return _windows_.PrintData_GetMedia(*args, **kwargs)
+
     def SetNoCopies(*args, **kwargs):
         """SetNoCopies(self, int v)"""
         return _windows_.PrintData_SetNoCopies(*args, **kwargs)
@@ -3774,6 +3942,10 @@ class PrintData(_core.Object):
         """SetOrientation(self, int orient)"""
         return _windows_.PrintData_SetOrientation(*args, **kwargs)
 
+    def SetOrientationReversed(*args, **kwargs):
+        """SetOrientationReversed(self, bool reversed)"""
+        return _windows_.PrintData_SetOrientationReversed(*args, **kwargs)
+
     def SetPrinterName(*args, **kwargs):
         """SetPrinterName(self, String name)"""
         return _windows_.PrintData_SetPrinterName(*args, **kwargs)
@@ -3806,6 +3978,10 @@ class PrintData(_core.Object):
         """SetPrintMode(self, int printMode)"""
         return _windows_.PrintData_SetPrintMode(*args, **kwargs)
 
+    def SetMedia(*args, **kwargs):
+        """SetMedia(self, int media)"""
+        return _windows_.PrintData_SetMedia(*args, **kwargs)
+
     def GetFilename(*args, **kwargs):
         """GetFilename(self) -> String"""
         return _windows_.PrintData_GetFilename(*args, **kwargs)
@@ -3814,7 +3990,7 @@ class PrintData(_core.Object):
         """SetFilename(self, String filename)"""
         return _windows_.PrintData_SetFilename(*args, **kwargs)
 
-    def __nonzero__(self): return self.Ok() 
+    def __nonzero__(self): return self.IsOk() 
     def GetPrivData(*args, **kwargs):
         """GetPrivData(self) -> PyObject"""
         return _windows_.PrintData_GetPrivData(*args, **kwargs)
@@ -3823,8 +3999,20 @@ class PrintData(_core.Object):
         """SetPrivData(self, PyObject data)"""
         return _windows_.PrintData_SetPrivData(*args, **kwargs)
 
-PrintData_swigregister = _windows_.PrintData_swigregister
-PrintData_swigregister(PrintData)
+    Bin = property(GetBin,SetBin,doc="See `GetBin` and `SetBin`") 
+    Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") 
+    Colour = property(GetColour,SetColour,doc="See `GetColour` and `SetColour`") 
+    Duplex = property(GetDuplex,SetDuplex,doc="See `GetDuplex` and `SetDuplex`") 
+    Filename = property(GetFilename,SetFilename,doc="See `GetFilename` and `SetFilename`") 
+    NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") 
+    Orientation = property(GetOrientation,SetOrientation,doc="See `GetOrientation` and `SetOrientation`") 
+    PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") 
+    PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") 
+    PrintMode = property(GetPrintMode,SetPrintMode,doc="See `GetPrintMode` and `SetPrintMode`") 
+    PrinterName = property(GetPrinterName,SetPrinterName,doc="See `GetPrinterName` and `SetPrinterName`") 
+    PrivData = property(GetPrivData,SetPrivData,doc="See `GetPrivData` and `SetPrivData`") 
+    Quality = property(GetQuality,SetQuality,doc="See `GetQuality` and `SetQuality`") 
+_windows_.PrintData_swigregister(PrintData)
 PrintoutTitleStr = cvar.PrintoutTitleStr
 PreviewCanvasNameStr = cvar.PreviewCanvasNameStr
 
@@ -3917,10 +4105,11 @@ class PageSetupDialogData(_core.Object):
         """GetPrintData(self) -> PrintData"""
         return _windows_.PageSetupDialogData_GetPrintData(*args, **kwargs)
 
-    def Ok(*args, **kwargs):
-        """Ok(self) -> bool"""
-        return _windows_.PageSetupDialogData_Ok(*args, **kwargs)
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _windows_.PageSetupDialogData_IsOk(*args, **kwargs)
 
+    Ok = IsOk 
     def SetDefaultInfo(*args, **kwargs):
         """SetDefaultInfo(self, bool flag)"""
         return _windows_.PageSetupDialogData_SetDefaultInfo(*args, **kwargs)
@@ -3965,9 +4154,17 @@ class PageSetupDialogData(_core.Object):
         """CalculatePaperSizeFromId(self)"""
         return _windows_.PageSetupDialogData_CalculatePaperSizeFromId(*args, **kwargs)
 
-    def __nonzero__(self): return self.Ok() 
-PageSetupDialogData_swigregister = _windows_.PageSetupDialogData_swigregister
-PageSetupDialogData_swigregister(PageSetupDialogData)
+    def __nonzero__(self): return self.IsOk() 
+    DefaultInfo = property(GetDefaultInfo,SetDefaultInfo,doc="See `GetDefaultInfo` and `SetDefaultInfo`") 
+    DefaultMinMargins = property(GetDefaultMinMargins,SetDefaultMinMargins,doc="See `GetDefaultMinMargins` and `SetDefaultMinMargins`") 
+    MarginBottomRight = property(GetMarginBottomRight,SetMarginBottomRight,doc="See `GetMarginBottomRight` and `SetMarginBottomRight`") 
+    MarginTopLeft = property(GetMarginTopLeft,SetMarginTopLeft,doc="See `GetMarginTopLeft` and `SetMarginTopLeft`") 
+    MinMarginBottomRight = property(GetMinMarginBottomRight,SetMinMarginBottomRight,doc="See `GetMinMarginBottomRight` and `SetMinMarginBottomRight`") 
+    MinMarginTopLeft = property(GetMinMarginTopLeft,SetMinMarginTopLeft,doc="See `GetMinMarginTopLeft` and `SetMinMarginTopLeft`") 
+    PaperId = property(GetPaperId,SetPaperId,doc="See `GetPaperId` and `SetPaperId`") 
+    PaperSize = property(GetPaperSize,SetPaperSize,doc="See `GetPaperSize` and `SetPaperSize`") 
+    PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") 
+_windows_.PageSetupDialogData_swigregister(PageSetupDialogData)
 
 class PageSetupDialog(_core.Object):
     """Proxy of C++ PageSetupDialog class"""
@@ -3976,6 +4173,8 @@ class PageSetupDialog(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, PageSetupDialogData data=None) -> PageSetupDialog"""
         _windows_.PageSetupDialog_swiginit(self,_windows_.new_PageSetupDialog(*args, **kwargs))
+    __swig_destroy__ = _windows_.delete_PageSetupDialog
+    __del__ = lambda self : None;
     def GetPageSetupData(*args, **kwargs):
         """GetPageSetupData(self) -> PageSetupDialogData"""
         return _windows_.PageSetupDialog_GetPageSetupData(*args, **kwargs)
@@ -3988,8 +4187,10 @@ class PageSetupDialog(_core.Object):
         """ShowModal(self) -> int"""
         return _windows_.PageSetupDialog_ShowModal(*args, **kwargs)
 
-PageSetupDialog_swigregister = _windows_.PageSetupDialog_swigregister
-PageSetupDialog_swigregister(PageSetupDialog)
+    def Destroy(self): pass 
+    PageSetupData = property(GetPageSetupData,doc="See `GetPageSetupData`") 
+    PageSetupDialogData = property(GetPageSetupDialogData,doc="See `GetPageSetupDialogData`") 
+_windows_.PageSetupDialog_swigregister(PageSetupDialog)
 
 class PrintDialogData(_core.Object):
     """Proxy of C++ PrintDialogData class"""
@@ -4108,10 +4309,11 @@ class PrintDialogData(_core.Object):
         """GetEnableHelp(self) -> bool"""
         return _windows_.PrintDialogData_GetEnableHelp(*args, **kwargs)
 
-    def Ok(*args, **kwargs):
-        """Ok(self) -> bool"""
-        return _windows_.PrintDialogData_Ok(*args, **kwargs)
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _windows_.PrintDialogData_IsOk(*args, **kwargs)
 
+    Ok = IsOk 
     def GetPrintData(*args, **kwargs):
         """GetPrintData(self) -> PrintData"""
         return _windows_.PrintDialogData_GetPrintData(*args, **kwargs)
@@ -4120,9 +4322,18 @@ class PrintDialogData(_core.Object):
         """SetPrintData(self, PrintData printData)"""
         return _windows_.PrintDialogData_SetPrintData(*args, **kwargs)
 
-    def __nonzero__(self): return self.Ok() 
-PrintDialogData_swigregister = _windows_.PrintDialogData_swigregister
-PrintDialogData_swigregister(PrintDialogData)
+    def __nonzero__(self): return self.IsOk() 
+    AllPages = property(GetAllPages,SetAllPages,doc="See `GetAllPages` and `SetAllPages`") 
+    Collate = property(GetCollate,SetCollate,doc="See `GetCollate` and `SetCollate`") 
+    FromPage = property(GetFromPage,SetFromPage,doc="See `GetFromPage` and `SetFromPage`") 
+    MaxPage = property(GetMaxPage,SetMaxPage,doc="See `GetMaxPage` and `SetMaxPage`") 
+    MinPage = property(GetMinPage,SetMinPage,doc="See `GetMinPage` and `SetMinPage`") 
+    NoCopies = property(GetNoCopies,SetNoCopies,doc="See `GetNoCopies` and `SetNoCopies`") 
+    PrintData = property(GetPrintData,SetPrintData,doc="See `GetPrintData` and `SetPrintData`") 
+    PrintToFile = property(GetPrintToFile,SetPrintToFile,doc="See `GetPrintToFile` and `SetPrintToFile`") 
+    Selection = property(GetSelection,SetSelection,doc="See `GetSelection` and `SetSelection`") 
+    ToPage = property(GetToPage,SetToPage,doc="See `GetToPage` and `SetToPage`") 
+_windows_.PrintDialogData_swigregister(PrintDialogData)
 
 class PrintDialog(_core.Object):
     """Proxy of C++ PrintDialog class"""
@@ -4131,6 +4342,8 @@ class PrintDialog(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self, Window parent, PrintDialogData data=None) -> PrintDialog"""
         _windows_.PrintDialog_swiginit(self,_windows_.new_PrintDialog(*args, **kwargs))
+    __swig_destroy__ = _windows_.delete_PrintDialog
+    __del__ = lambda self : None;
     def ShowModal(*args, **kwargs):
         """ShowModal(self) -> int"""
         return _windows_.PrintDialog_ShowModal(*args, **kwargs)
@@ -4147,8 +4360,11 @@ class PrintDialog(_core.Object):
         """GetPrintDC(self) -> DC"""
         return _windows_.PrintDialog_GetPrintDC(*args, **kwargs)
 
-PrintDialog_swigregister = _windows_.PrintDialog_swigregister
-PrintDialog_swigregister(PrintDialog)
+    def Destroy(self): pass 
+    PrintDC = property(GetPrintDC,doc="See `GetPrintDC`") 
+    PrintData = property(GetPrintData,doc="See `GetPrintData`") 
+    PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") 
+_windows_.PrintDialog_swigregister(PrintDialog)
 
 PRINTER_NO_ERROR = _windows_.PRINTER_NO_ERROR
 PRINTER_CANCELLED = _windows_.PRINTER_CANCELLED
@@ -4195,8 +4411,9 @@ class Printer(_core.Object):
         return _windows_.Printer_GetLastError(*args, **kwargs)
 
     GetLastError = staticmethod(GetLastError)
-Printer_swigregister = _windows_.Printer_swigregister
-Printer_swigregister(Printer)
+    Abort = property(GetAbort,doc="See `GetAbort`") 
+    PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") 
+_windows_.Printer_swigregister(Printer)
 
 def Printer_GetLastError(*args):
   """Printer_GetLastError() -> int"""
@@ -4209,7 +4426,7 @@ class Printout(_core.Object):
     def __init__(self, *args, **kwargs): 
         """__init__(self, String title=PrintoutTitleStr) -> Printout"""
         _windows_.Printout_swiginit(self,_windows_.new_Printout(*args, **kwargs))
-        self._setCallbackInfo(self, Printout)
+        Printout._setCallbackInfo(self, self, Printout)
 
     __swig_destroy__ = _windows_.delete_Printout
     __del__ = lambda self : None;
@@ -4229,6 +4446,54 @@ class Printout(_core.Object):
         """SetDC(self, DC dc)"""
         return _windows_.Printout_SetDC(*args, **kwargs)
 
+    def FitThisSizeToPaper(*args, **kwargs):
+        """FitThisSizeToPaper(self, Size imageSize)"""
+        return _windows_.Printout_FitThisSizeToPaper(*args, **kwargs)
+
+    def FitThisSizeToPage(*args, **kwargs):
+        """FitThisSizeToPage(self, Size imageSize)"""
+        return _windows_.Printout_FitThisSizeToPage(*args, **kwargs)
+
+    def FitThisSizeToPageMargins(*args, **kwargs):
+        """FitThisSizeToPageMargins(self, Size imageSize, PageSetupDialogData pageSetupData)"""
+        return _windows_.Printout_FitThisSizeToPageMargins(*args, **kwargs)
+
+    def MapScreenSizeToPaper(*args, **kwargs):
+        """MapScreenSizeToPaper(self)"""
+        return _windows_.Printout_MapScreenSizeToPaper(*args, **kwargs)
+
+    def MapScreenSizeToPage(*args, **kwargs):
+        """MapScreenSizeToPage(self)"""
+        return _windows_.Printout_MapScreenSizeToPage(*args, **kwargs)
+
+    def MapScreenSizeToPageMargins(*args, **kwargs):
+        """MapScreenSizeToPageMargins(self, PageSetupDialogData pageSetupData)"""
+        return _windows_.Printout_MapScreenSizeToPageMargins(*args, **kwargs)
+
+    def MapScreenSizeToDevice(*args, **kwargs):
+        """MapScreenSizeToDevice(self)"""
+        return _windows_.Printout_MapScreenSizeToDevice(*args, **kwargs)
+
+    def GetLogicalPaperRect(*args, **kwargs):
+        """GetLogicalPaperRect(self) -> Rect"""
+        return _windows_.Printout_GetLogicalPaperRect(*args, **kwargs)
+
+    def GetLogicalPageRect(*args, **kwargs):
+        """GetLogicalPageRect(self) -> Rect"""
+        return _windows_.Printout_GetLogicalPageRect(*args, **kwargs)
+
+    def GetLogicalPageMarginsRect(*args, **kwargs):
+        """GetLogicalPageMarginsRect(self, PageSetupDialogData pageSetupData) -> Rect"""
+        return _windows_.Printout_GetLogicalPageMarginsRect(*args, **kwargs)
+
+    def SetLogicalOrigin(*args, **kwargs):
+        """SetLogicalOrigin(self, int x, int y)"""
+        return _windows_.Printout_SetLogicalOrigin(*args, **kwargs)
+
+    def OffsetLogicalOrigin(*args, **kwargs):
+        """OffsetLogicalOrigin(self, int xoff, int yoff)"""
+        return _windows_.Printout_OffsetLogicalOrigin(*args, **kwargs)
+
     def SetPageSizePixels(*args, **kwargs):
         """SetPageSizePixels(self, int w, int h)"""
         return _windows_.Printout_SetPageSizePixels(*args, **kwargs)
@@ -4261,6 +4526,14 @@ class Printout(_core.Object):
         """GetPPIPrinter() -> (x,y)"""
         return _windows_.Printout_GetPPIPrinter(*args, **kwargs)
 
+    def SetPaperRectPixels(*args, **kwargs):
+        """SetPaperRectPixels(self, Rect paperRectPixels)"""
+        return _windows_.Printout_SetPaperRectPixels(*args, **kwargs)
+
+    def GetPaperRectPixels(*args, **kwargs):
+        """GetPaperRectPixels(self) -> Rect"""
+        return _windows_.Printout_GetPaperRectPixels(*args, **kwargs)
+
     def IsPreview(*args, **kwargs):
         """IsPreview(self) -> bool"""
         return _windows_.Printout_IsPreview(*args, **kwargs)
@@ -4327,8 +4600,13 @@ class Printout(_core.Object):
     base_GetPageInfo = wx._deprecated(base_GetPageInfo,
                                    "Please use Printout.GetPageInfo instead.")
 
-Printout_swigregister = _windows_.Printout_swigregister
-Printout_swigregister(Printout)
+    DC = property(GetDC,SetDC,doc="See `GetDC` and `SetDC`") 
+    PPIPrinter = property(GetPPIPrinter,SetPPIPrinter,doc="See `GetPPIPrinter` and `SetPPIPrinter`") 
+    PPIScreen = property(GetPPIScreen,SetPPIScreen,doc="See `GetPPIScreen` and `SetPPIScreen`") 
+    PageSizeMM = property(GetPageSizeMM,SetPageSizeMM,doc="See `GetPageSizeMM` and `SetPageSizeMM`") 
+    PageSizePixels = property(GetPageSizePixels,SetPageSizePixels,doc="See `GetPageSizePixels` and `SetPageSizePixels`") 
+    Title = property(GetTitle,doc="See `GetTitle`") 
+_windows_.Printout_swigregister(Printout)
 
 class PreviewCanvas(ScrolledWindow):
     """Proxy of C++ PreviewCanvas class"""
@@ -4343,8 +4621,7 @@ class PreviewCanvas(ScrolledWindow):
         _windows_.PreviewCanvas_swiginit(self,_windows_.new_PreviewCanvas(*args, **kwargs))
         self._setOORInfo(self)
 
-PreviewCanvas_swigregister = _windows_.PreviewCanvas_swigregister
-PreviewCanvas_swigregister(PreviewCanvas)
+_windows_.PreviewCanvas_swigregister(PreviewCanvas)
 
 class PreviewFrame(Frame):
     """Proxy of C++ PreviewFrame class"""
@@ -4375,8 +4652,8 @@ class PreviewFrame(Frame):
         """GetControlBar(self) -> PreviewControlBar"""
         return _windows_.PreviewFrame_GetControlBar(*args, **kwargs)
 
-PreviewFrame_swigregister = _windows_.PreviewFrame_swigregister
-PreviewFrame_swigregister(PreviewFrame)
+    ControlBar = property(GetControlBar,doc="See `GetControlBar`") 
+_windows_.PreviewFrame_swigregister(PreviewFrame)
 
 PREVIEW_PRINT = _windows_.PREVIEW_PRINT
 PREVIEW_PREVIOUS = _windows_.PREVIEW_PREVIOUS
@@ -4439,8 +4716,9 @@ class PreviewControlBar(Panel):
         """OnGoto(self)"""
         return _windows_.PreviewControlBar_OnGoto(*args, **kwargs)
 
-PreviewControlBar_swigregister = _windows_.PreviewControlBar_swigregister
-PreviewControlBar_swigregister(PreviewControlBar)
+    PrintPreview = property(GetPrintPreview,doc="See `GetPrintPreview`") 
+    ZoomControl = property(GetZoomControl,SetZoomControl,doc="See `GetZoomControl` and `SetZoomControl`") 
+_windows_.PreviewControlBar_swigregister(PreviewControlBar)
 
 class PrintPreview(_core.Object):
     """Proxy of C++ PrintPreview class"""
@@ -4526,10 +4804,11 @@ class PrintPreview(_core.Object):
         """GetMinPage(self) -> int"""
         return _windows_.PrintPreview_GetMinPage(*args, **kwargs)
 
-    def Ok(*args, **kwargs):
-        """Ok(self) -> bool"""
-        return _windows_.PrintPreview_Ok(*args, **kwargs)
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _windows_.PrintPreview_IsOk(*args, **kwargs)
 
+    Ok = IsOk 
     def SetOk(*args, **kwargs):
         """SetOk(self, bool ok)"""
         return _windows_.PrintPreview_SetOk(*args, **kwargs)
@@ -4542,9 +4821,17 @@ class PrintPreview(_core.Object):
         """DetermineScaling(self)"""
         return _windows_.PrintPreview_DetermineScaling(*args, **kwargs)
 
-    def __nonzero__(self): return self.Ok() 
-PrintPreview_swigregister = _windows_.PrintPreview_swigregister
-PrintPreview_swigregister(PrintPreview)
+    def __nonzero__(self): return self.IsOk() 
+    Canvas = property(GetCanvas,SetCanvas,doc="See `GetCanvas` and `SetCanvas`") 
+    CurrentPage = property(GetCurrentPage,SetCurrentPage,doc="See `GetCurrentPage` and `SetCurrentPage`") 
+    Frame = property(GetFrame,SetFrame,doc="See `GetFrame` and `SetFrame`") 
+    MaxPage = property(GetMaxPage,doc="See `GetMaxPage`") 
+    MinPage = property(GetMinPage,doc="See `GetMinPage`") 
+    PrintDialogData = property(GetPrintDialogData,doc="See `GetPrintDialogData`") 
+    Printout = property(GetPrintout,SetPrintout,doc="See `GetPrintout` and `SetPrintout`") 
+    PrintoutForPrinting = property(GetPrintoutForPrinting,doc="See `GetPrintoutForPrinting`") 
+    Zoom = property(GetZoom,SetZoom,doc="See `GetZoom` and `SetZoom`") 
+_windows_.PrintPreview_swigregister(PrintPreview)
 
 class PyPrintPreview(PrintPreview):
     """Proxy of C++ PyPrintPreview class"""
@@ -4556,7 +4843,7 @@ class PyPrintPreview(PrintPreview):
         __init__(self, Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
         """
         _windows_.PyPrintPreview_swiginit(self,_windows_.new_PyPrintPreview(*args))
-        self._setCallbackInfo(self, PyPrintPreview)
+        PyPrintPreview._setCallbackInfo(self, self, PyPrintPreview)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4597,8 +4884,7 @@ class PyPrintPreview(PrintPreview):
     base_DetermineScaling = wx._deprecated(base_DetermineScaling,
                                    "Please use PyPrintPreview.DetermineScaling instead.")
 
-PyPrintPreview_swigregister = _windows_.PyPrintPreview_swigregister
-PyPrintPreview_swigregister(PyPrintPreview)
+_windows_.PyPrintPreview_swigregister(PyPrintPreview)
 
 class PyPreviewFrame(PreviewFrame):
     """Proxy of C++ PyPreviewFrame class"""
@@ -4611,7 +4897,7 @@ class PyPreviewFrame(PreviewFrame):
             long style=DEFAULT_FRAME_STYLE, String name=FrameNameStr) -> PyPreviewFrame
         """
         _windows_.PyPreviewFrame_swiginit(self,_windows_.new_PyPreviewFrame(*args, **kwargs))
-        self._setCallbackInfo(self, PyPreviewFrame); self._setOORInfo(self)
+        self._setOORInfo(self);PyPreviewFrame._setCallbackInfo(self, self, PyPreviewFrame)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4652,8 +4938,7 @@ class PyPreviewFrame(PreviewFrame):
     base_CreateControlBar = wx._deprecated(base_CreateControlBar,
                                    "Please use PyPreviewFrame.CreateControlBar instead.")
 
-PyPreviewFrame_swigregister = _windows_.PyPreviewFrame_swigregister
-PyPreviewFrame_swigregister(PyPreviewFrame)
+_windows_.PyPreviewFrame_swigregister(PyPreviewFrame)
 
 class PyPreviewControlBar(PreviewControlBar):
     """Proxy of C++ PyPreviewControlBar class"""
@@ -4666,7 +4951,7 @@ class PyPreviewControlBar(PreviewControlBar):
             long style=0, String name=PanelNameStr) -> PyPreviewControlBar
         """
         _windows_.PyPreviewControlBar_swiginit(self,_windows_.new_PyPreviewControlBar(*args, **kwargs))
-        self._setCallbackInfo(self, PyPreviewControlBar); self._setOORInfo(self)
+        self._setOORInfo(self);PyPreviewControlBar._setCallbackInfo(self, self, PyPreviewControlBar)
 
     def _setCallbackInfo(*args, **kwargs):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
@@ -4694,8 +4979,7 @@ class PyPreviewControlBar(PreviewControlBar):
     base_SetZoomControl = wx._deprecated(base_SetZoomControl,
                                    "Please use PreviewControlBar.SetZoomControl instead.")
 
-PyPreviewControlBar_swigregister = _windows_.PyPreviewControlBar_swigregister
-PyPreviewControlBar_swigregister(PyPreviewControlBar)
+_windows_.PyPreviewControlBar_swigregister(PyPreviewControlBar)