X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b449b1967cbe19be6fe774ac9ae71baf34aacf1..7e173fdcefe57cb969e05be3f465c3e2b954e296:/wxPython/src/gtk/_windows.py

diff --git a/wxPython/src/gtk/_windows.py b/wxPython/src/gtk/_windows.py
index f556413750..35df2b8110 100644
--- a/wxPython/src/gtk/_windows.py
+++ b/wxPython/src/gtk/_windows.py
@@ -305,13 +305,11 @@ ICONIZE = _windows_.ICONIZE
 MINIMIZE = _windows_.MINIMIZE
 MAXIMIZE = _windows_.MAXIMIZE
 CLOSE_BOX = _windows_.CLOSE_BOX
-THICK_FRAME = _windows_.THICK_FRAME
 SYSTEM_MENU = _windows_.SYSTEM_MENU
 MINIMIZE_BOX = _windows_.MINIMIZE_BOX
 MAXIMIZE_BOX = _windows_.MAXIMIZE_BOX
 TINY_CAPTION_HORIZ = _windows_.TINY_CAPTION_HORIZ
 TINY_CAPTION_VERT = _windows_.TINY_CAPTION_VERT
-RESIZE_BOX = _windows_.RESIZE_BOX
 RESIZE_BORDER = _windows_.RESIZE_BORDER
 DIALOG_NO_PARENT = _windows_.DIALOG_NO_PARENT
 DEFAULT_FRAME_STYLE = _windows_.DEFAULT_FRAME_STYLE
@@ -325,12 +323,18 @@ 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
+# deprecated
+RESIZE_BOX  = MAXIMIZE_BOX
+THICK_FRAME = RESIZE_BORDER
+     
+# Obsolete
+wxDIALOG_MODAL = 0
+wxDIALOG_MODELESS = 0
+wxUSER_COLOURS = 0
+wxNO_3D = 0
+
 FULLSCREEN_NOMENUBAR = _windows_.FULLSCREEN_NOMENUBAR
 FULLSCREEN_NOTOOLBAR = _windows_.FULLSCREEN_NOTOOLBAR
 FULLSCREEN_NOSTATUSBAR = _windows_.FULLSCREEN_NOSTATUSBAR
@@ -397,6 +401,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)
@@ -426,10 +434,6 @@ class TopLevelWindow(_core.Window):
         return _windows_.TopLevelWindow_CenterOnScreen(*args, **kwargs)
 
     CentreOnScreen = CenterOnScreen 
-    def EnableCloseButton(*args, **kwargs):
-        """EnableCloseButton(self, bool enable=True) -> bool"""
-        return _windows_.TopLevelWindow_EnableCloseButton(*args, **kwargs)
-
     def GetDefaultItem(*args, **kwargs):
         """
         GetDefaultItem(self) -> Window
@@ -745,6 +749,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')
@@ -753,7 +758,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)
@@ -762,7 +767,7 @@ 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)
 
@@ -1417,14 +1422,6 @@ class SashWindow(_core.Window):
         """GetSashVisible(self, int edge) -> bool"""
         return _windows_.SashWindow_GetSashVisible(*args, **kwargs)
 
-    def SetSashBorder(*args, **kwargs):
-        """SetSashBorder(self, int edge, bool border)"""
-        return _windows_.SashWindow_SetSashBorder(*args, **kwargs)
-
-    def HasBorder(*args, **kwargs):
-        """HasBorder(self, int edge) -> bool"""
-        return _windows_.SashWindow_HasBorder(*args, **kwargs)
-
     def GetEdgeMargin(*args, **kwargs):
         """GetEdgeMargin(self, int edge) -> int"""
         return _windows_.SashWindow_GetEdgeMargin(*args, **kwargs)
@@ -1749,7 +1746,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)"""
@@ -1800,7 +1797,219 @@ _windows_.TipWindow_swigregister(TipWindow)
 
 #---------------------------------------------------------------------------
 
-class VScrolledWindow(Panel):
+class VarScrollHelperBase(object):
+    """Proxy of C++ VarScrollHelperBase class"""
+    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"
+    __repr__ = _swig_repr
+    def EnablePhysicalScrolling(*args, **kwargs):
+        """EnablePhysicalScrolling(self, bool scrolling=True)"""
+        return _windows_.VarScrollHelperBase_EnablePhysicalScrolling(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(self, int coord) -> int"""
+        return _windows_.VarScrollHelperBase_HitTest(*args, **kwargs)
+
+    def RefreshAll(*args, **kwargs):
+        """RefreshAll(self)"""
+        return _windows_.VarScrollHelperBase_RefreshAll(*args, **kwargs)
+
+    def GetVisibleBegin(*args, **kwargs):
+        """GetVisibleBegin(self) -> size_t"""
+        return _windows_.VarScrollHelperBase_GetVisibleBegin(*args, **kwargs)
+
+    def GetVisibleEnd(*args, **kwargs):
+        """GetVisibleEnd(self) -> size_t"""
+        return _windows_.VarScrollHelperBase_GetVisibleEnd(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(self, size_t unit) -> bool"""
+        return _windows_.VarScrollHelperBase_IsVisible(*args, **kwargs)
+
+    def CalcScrolledPosition(*args, **kwargs):
+        """CalcScrolledPosition(self, int coord) -> int"""
+        return _windows_.VarScrollHelperBase_CalcScrolledPosition(*args, **kwargs)
+
+    def CalcUnscrolledPosition(*args, **kwargs):
+        """CalcUnscrolledPosition(self, int coord) -> int"""
+        return _windows_.VarScrollHelperBase_CalcUnscrolledPosition(*args, **kwargs)
+
+    def UpdateScrollbar(*args, **kwargs):
+        """UpdateScrollbar(self)"""
+        return _windows_.VarScrollHelperBase_UpdateScrollbar(*args, **kwargs)
+
+    def RemoveScrollbar(*args, **kwargs):
+        """RemoveScrollbar(self)"""
+        return _windows_.VarScrollHelperBase_RemoveScrollbar(*args, **kwargs)
+
+    def SetTargetWindow(*args, **kwargs):
+        """SetTargetWindow(self, Window target)"""
+        return _windows_.VarScrollHelperBase_SetTargetWindow(*args, **kwargs)
+
+    def GetTargetWindow(*args, **kwargs):
+        """GetTargetWindow(self) -> Window"""
+        return _windows_.VarScrollHelperBase_GetTargetWindow(*args, **kwargs)
+
+    def GetOrientationTargetSize(*args, **kwargs):
+        """GetOrientationTargetSize(self) -> int"""
+        return _windows_.VarScrollHelperBase_GetOrientationTargetSize(*args, **kwargs)
+
+    def GetNonOrientationTargetSize(*args, **kwargs):
+        """GetNonOrientationTargetSize(self) -> int"""
+        return _windows_.VarScrollHelperBase_GetNonOrientationTargetSize(*args, **kwargs)
+
+    def GetOrientation(*args, **kwargs):
+        """GetOrientation(self) -> int"""
+        return _windows_.VarScrollHelperBase_GetOrientation(*args, **kwargs)
+
+_windows_.VarScrollHelperBase_swigregister(VarScrollHelperBase)
+
+class VarVScrollHelper(VarScrollHelperBase):
+    """Proxy of C++ VarVScrollHelper class"""
+    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"
+    __repr__ = _swig_repr
+    def SetRowCount(*args, **kwargs):
+        """SetRowCount(self, size_t rowCount)"""
+        return _windows_.VarVScrollHelper_SetRowCount(*args, **kwargs)
+
+    def ScrollToRow(*args, **kwargs):
+        """ScrollToRow(self, size_t row) -> bool"""
+        return _windows_.VarVScrollHelper_ScrollToRow(*args, **kwargs)
+
+    def ScrollRows(*args, **kwargs):
+        """ScrollRows(self, int rows) -> bool"""
+        return _windows_.VarVScrollHelper_ScrollRows(*args, **kwargs)
+
+    def ScrollRowPages(*args, **kwargs):
+        """ScrollRowPages(self, int pages) -> bool"""
+        return _windows_.VarVScrollHelper_ScrollRowPages(*args, **kwargs)
+
+    def RefreshRow(*args, **kwargs):
+        """RefreshRow(self, size_t row)"""
+        return _windows_.VarVScrollHelper_RefreshRow(*args, **kwargs)
+
+    def RefreshRows(*args, **kwargs):
+        """RefreshRows(self, size_t from, size_t to)"""
+        return _windows_.VarVScrollHelper_RefreshRows(*args, **kwargs)
+
+    def GetRowCount(*args, **kwargs):
+        """GetRowCount(self) -> size_t"""
+        return _windows_.VarVScrollHelper_GetRowCount(*args, **kwargs)
+
+    def GetVisibleRowsBegin(*args, **kwargs):
+        """GetVisibleRowsBegin(self) -> size_t"""
+        return _windows_.VarVScrollHelper_GetVisibleRowsBegin(*args, **kwargs)
+
+    def GetVisibleRowsEnd(*args, **kwargs):
+        """GetVisibleRowsEnd(self) -> size_t"""
+        return _windows_.VarVScrollHelper_GetVisibleRowsEnd(*args, **kwargs)
+
+    def IsRowVisible(*args, **kwargs):
+        """IsRowVisible(self, size_t row) -> bool"""
+        return _windows_.VarVScrollHelper_IsRowVisible(*args, **kwargs)
+
+_windows_.VarVScrollHelper_swigregister(VarVScrollHelper)
+
+class VarHScrollHelper(VarScrollHelperBase):
+    """Proxy of C++ VarHScrollHelper class"""
+    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"
+    __repr__ = _swig_repr
+    def SetColumnCount(*args, **kwargs):
+        """SetColumnCount(self, size_t columnCount)"""
+        return _windows_.VarHScrollHelper_SetColumnCount(*args, **kwargs)
+
+    def ScrollToColumn(*args, **kwargs):
+        """ScrollToColumn(self, size_t column) -> bool"""
+        return _windows_.VarHScrollHelper_ScrollToColumn(*args, **kwargs)
+
+    def ScrollColumns(*args, **kwargs):
+        """ScrollColumns(self, int columns) -> bool"""
+        return _windows_.VarHScrollHelper_ScrollColumns(*args, **kwargs)
+
+    def ScrollColumnPages(*args, **kwargs):
+        """ScrollColumnPages(self, int pages) -> bool"""
+        return _windows_.VarHScrollHelper_ScrollColumnPages(*args, **kwargs)
+
+    def RefreshColumn(*args, **kwargs):
+        """RefreshColumn(self, size_t column)"""
+        return _windows_.VarHScrollHelper_RefreshColumn(*args, **kwargs)
+
+    def RefreshColumns(*args, **kwargs):
+        """RefreshColumns(self, size_t from, size_t to)"""
+        return _windows_.VarHScrollHelper_RefreshColumns(*args, **kwargs)
+
+    def GetColumnCount(*args, **kwargs):
+        """GetColumnCount(self) -> size_t"""
+        return _windows_.VarHScrollHelper_GetColumnCount(*args, **kwargs)
+
+    def GetVisibleColumnsBegin(*args, **kwargs):
+        """GetVisibleColumnsBegin(self) -> size_t"""
+        return _windows_.VarHScrollHelper_GetVisibleColumnsBegin(*args, **kwargs)
+
+    def GetVisibleColumnsEnd(*args, **kwargs):
+        """GetVisibleColumnsEnd(self) -> size_t"""
+        return _windows_.VarHScrollHelper_GetVisibleColumnsEnd(*args, **kwargs)
+
+    def IsColumnVisible(*args, **kwargs):
+        """IsColumnVisible(self, size_t column) -> bool"""
+        return _windows_.VarHScrollHelper_IsColumnVisible(*args, **kwargs)
+
+_windows_.VarHScrollHelper_swigregister(VarHScrollHelper)
+
+class VarHVScrollHelper(VarVScrollHelper,VarHScrollHelper):
+    """Proxy of C++ VarHVScrollHelper class"""
+    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"
+    __repr__ = _swig_repr
+    def SetRowColumnCount(*args, **kwargs):
+        """SetRowColumnCount(self, size_t rowCount, size_t columnCount)"""
+        return _windows_.VarHVScrollHelper_SetRowColumnCount(*args, **kwargs)
+
+    def EnablePhysicalScrolling(*args, **kwargs):
+        """EnablePhysicalScrolling(self, bool vscrolling=True, bool hscrolling=True)"""
+        return _windows_.VarHVScrollHelper_EnablePhysicalScrolling(*args, **kwargs)
+
+    def ScrollToRowColumn(*args, **kwargs):
+        """ScrollToRowColumn(self, Position pos) -> bool"""
+        return _windows_.VarHVScrollHelper_ScrollToRowColumn(*args, **kwargs)
+
+    def RefreshRowColumn(*args, **kwargs):
+        """RefreshRowColumn(self, Position pos)"""
+        return _windows_.VarHVScrollHelper_RefreshRowColumn(*args, **kwargs)
+
+    def RefreshRowsColumns(*args, **kwargs):
+        """RefreshRowsColumns(self, Position from, Position to)"""
+        return _windows_.VarHVScrollHelper_RefreshRowsColumns(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """HitTest(self, Point pos) -> Position"""
+        return _windows_.VarHVScrollHelper_HitTest(*args, **kwargs)
+
+    def ScrollLayout(*args, **kwargs):
+        """ScrollLayout(self) -> bool"""
+        return _windows_.VarHVScrollHelper_ScrollLayout(*args, **kwargs)
+
+    def GetRowColumnCount(*args, **kwargs):
+        """GetRowColumnCount(self) -> Size"""
+        return _windows_.VarHVScrollHelper_GetRowColumnCount(*args, **kwargs)
+
+    def GetVisibleBegin(*args, **kwargs):
+        """GetVisibleBegin(self) -> Position"""
+        return _windows_.VarHVScrollHelper_GetVisibleBegin(*args, **kwargs)
+
+    def GetVisibleEnd(*args, **kwargs):
+        """GetVisibleEnd(self) -> Position"""
+        return _windows_.VarHVScrollHelper_GetVisibleEnd(*args, **kwargs)
+
+    def IsVisible(*args, **kwargs):
+        """IsVisible(self, Position pos) -> bool"""
+        return _windows_.VarHVScrollHelper_IsVisible(*args, **kwargs)
+
+_windows_.VarHVScrollHelper_swigregister(VarHVScrollHelper)
+
+class VScrolledWindow(Panel,VarVScrollHelper):
     """Proxy of C++ VScrolledWindow class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
     __repr__ = _swig_repr
@@ -1810,7 +2019,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)"""
@@ -1823,29 +2032,89 @@ class VScrolledWindow(Panel):
         """
         return _windows_.VScrolledWindow_Create(*args, **kwargs)
 
-    def SetLineCount(*args, **kwargs):
-        """SetLineCount(self, size_t count)"""
-        return _windows_.VScrolledWindow_SetLineCount(*args, **kwargs)
+    def GetRowsHeight(*args, **kwargs):
+        """GetRowsHeight(self, size_t lineMin, size_t lineMax) -> int"""
+        return _windows_.VScrolledWindow_GetRowsHeight(*args, **kwargs)
+
+    GetLinesHeight = wx._deprecated(GetRowsHeight,
+                                                     "Use GetRowsHeight instead.") 
+    def EstimateTotalHeight(*args, **kwargs):
+        """EstimateTotalHeight(self) -> int"""
+        return _windows_.VScrolledWindow_EstimateTotalHeight(*args, **kwargs)
+
+    def HitTest(*args, **kwargs):
+        """
+        HitTest(self, Point pt) -> int
+
+        Test where the given (in client coords) point lies
+        """
+        return _windows_.VScrolledWindow_HitTest(*args, **kwargs)
+
+    def GetFirstVisibleLine(self):
+        return self.GetVisibleRowsBegin()
+    GetFirstVisibleLine = wx._deprecated(GetFirstVisibleLine, "Use GetVisibleRowsBegin instead" )
 
-    def ScrollToLine(*args, **kwargs):
-        """ScrollToLine(self, size_t line) -> bool"""
-        return _windows_.VScrolledWindow_ScrollToLine(*args, **kwargs)
+    def GetLastVisibleLine(self):
+        return self.GetVisibleRowsEnd() - 1
+    GetLastVisibleLine = wx._deprecated(GetLastVisibleLine, "Use GetVisibleRowsEnd instead")
 
-    def RefreshLine(*args, **kwargs):
-        """RefreshLine(self, size_t line)"""
-        return _windows_.VScrolledWindow_RefreshLine(*args, **kwargs)
+    def GetLineCount(self):
+        return self.GetRowCount()
+    GetLineCount = wx._deprecated(GetLineCount, "Use GetRowCount instead")
 
-    def RefreshLines(*args, **kwargs):
-        """RefreshLines(self, size_t from, size_t to)"""
-        return _windows_.VScrolledWindow_RefreshLines(*args, **kwargs)
+    def SetLineCount(self, count):
+        self.SetRowCount(count)
+    SetLineCount = wx._deprecated(SetLineCount, "Use SetRowCount instead")
 
-    def HitTestXY(*args, **kwargs):
+    def RefreshLine(self, line):
+        self.RefreshRow(line)
+    RefreshLine = wx._deprecated(RefreshLine, "Use RefreshRow instead")
+
+    def RefreshLines(self, frm, to):
+        self.RefreshRows(frm, to)
+    RefreshLines = wx._deprecated(RefreshLines, "Use RefreshRows instead")
+        
+    def ScrollToLine(self, line):
+        return self.ScrollToRow(line)
+    ScrollToLine = wx._deprecated(ScrollToLine, "Use RefreshRow instead")
+
+    def ScrollLines(self, lines):
+        return self.ScrollRows(lines)
+    ScrollLines = wx._deprecated(ScrollLines, "Use ScrollRows instead")
+
+    def ScrollPages(self, pages):
+        return self.ScrollRowPages(pages)
+    ScrollPages = wx._deprecated(ScrollPages, "Use ScrollRowPages instead")
+
+_windows_.VScrolledWindow_swigregister(VScrolledWindow)
+
+def PreVScrolledWindow(*args, **kwargs):
+    """PreVScrolledWindow() -> VScrolledWindow"""
+    val = _windows_.new_PreVScrolledWindow(*args, **kwargs)
+    return val
+
+class HScrolledWindow(Panel,VarHScrollHelper):
+    """Proxy of C++ HScrolledWindow 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=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> HScrolledWindow
         """
-        HitTestXY(self, int x, int y) -> int
+        _windows_.HScrolledWindow_swiginit(self,_windows_.new_HScrolledWindow(*args, **kwargs))
+        self._setOORInfo(self);HScrolledWindow._setCallbackInfo(self, self, HScrolledWindow)
 
-        Test where the given (in client coords) point lies
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _windows_.HScrolledWindow__setCallbackInfo(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> bool
         """
-        return _windows_.VScrolledWindow_HitTestXY(*args, **kwargs)
+        return _windows_.HScrolledWindow_Create(*args, **kwargs)
 
     def HitTest(*args, **kwargs):
         """
@@ -1853,54 +2122,67 @@ class VScrolledWindow(Panel):
 
         Test where the given (in client coords) point lies
         """
-        return _windows_.VScrolledWindow_HitTest(*args, **kwargs)
+        return _windows_.HScrolledWindow_HitTest(*args, **kwargs)
 
-    def RefreshAll(*args, **kwargs):
-        """RefreshAll(self)"""
-        return _windows_.VScrolledWindow_RefreshAll(*args, **kwargs)
+    def GetColumnsWidth(*args, **kwargs):
+        """GetColumnsWidth(self, size_t columnMin, size_t columnMax) -> int"""
+        return _windows_.HScrolledWindow_GetColumnsWidth(*args, **kwargs)
 
-    def GetLineCount(*args, **kwargs):
-        """GetLineCount(self) -> size_t"""
-        return _windows_.VScrolledWindow_GetLineCount(*args, **kwargs)
+    def EstimateTotalWidth(*args, **kwargs):
+        """EstimateTotalWidth(self) -> int"""
+        return _windows_.HScrolledWindow_EstimateTotalWidth(*args, **kwargs)
 
-    def GetVisibleBegin(*args, **kwargs):
-        """GetVisibleBegin(self) -> size_t"""
-        return _windows_.VScrolledWindow_GetVisibleBegin(*args, **kwargs)
+_windows_.HScrolledWindow_swigregister(HScrolledWindow)
 
-    def GetVisibleEnd(*args, **kwargs):
-        """GetVisibleEnd(self) -> size_t"""
-        return _windows_.VScrolledWindow_GetVisibleEnd(*args, **kwargs)
+def PreHScrolledWindow(*args, **kwargs):
+    """PreHScrolledWindow() -> HScrolledWindow"""
+    val = _windows_.new_PreHScrolledWindow(*args, **kwargs)
+    return val
 
-    def IsVisible(*args, **kwargs):
-        """IsVisible(self, size_t line) -> bool"""
-        return _windows_.VScrolledWindow_IsVisible(*args, **kwargs)
-
-    def GetFirstVisibleLine(*args, **kwargs):
-        """GetFirstVisibleLine(self) -> size_t"""
-        return _windows_.VScrolledWindow_GetFirstVisibleLine(*args, **kwargs)
-
-    def GetLastVisibleLine(*args, **kwargs):
-        """GetLastVisibleLine(self) -> size_t"""
-        return _windows_.VScrolledWindow_GetLastVisibleLine(*args, **kwargs)
-
-    def FindFirstFromBottom(*args, **kwargs):
-        """FindFirstFromBottom(self, size_t lineLast, bool fullyVisible=False) -> size_t"""
-        return _windows_.VScrolledWindow_FindFirstFromBottom(*args, **kwargs)
-
-    def GetLinesHeight(*args, **kwargs):
-        """GetLinesHeight(self, size_t lineMin, size_t lineMax) -> int"""
-        return _windows_.VScrolledWindow_GetLinesHeight(*args, **kwargs)
-
-    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)
+class HVScrolledWindow(Panel,VarHVScrollHelper):
+    """Proxy of C++ HVScrolledWindow 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=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> HVScrolledWindow
+        """
+        _windows_.HVScrolledWindow_swiginit(self,_windows_.new_HVScrolledWindow(*args, **kwargs))
+        self._setOORInfo(self);HVScrolledWindow._setCallbackInfo(self, self, HVScrolledWindow)
 
-def PreVScrolledWindow(*args, **kwargs):
-    """PreVScrolledWindow() -> VScrolledWindow"""
-    val = _windows_.new_PreVScrolledWindow(*args, **kwargs)
+    def _setCallbackInfo(*args, **kwargs):
+        """_setCallbackInfo(self, PyObject self, PyObject _class)"""
+        return _windows_.HVScrolledWindow__setCallbackInfo(*args, **kwargs)
+
+    def Create(*args, **kwargs):
+        """
+        Create(self, Window parent, int id=ID_ANY, Point pos=DefaultPosition, 
+            Size size=DefaultSize, long style=0, String name=PanelNameStr) -> bool
+        """
+        return _windows_.HVScrolledWindow_Create(*args, **kwargs)
+
+    def GetRowsHeight(*args, **kwargs):
+        """GetRowsHeight(self, size_t lineMin, size_t lineMax) -> int"""
+        return _windows_.HVScrolledWindow_GetRowsHeight(*args, **kwargs)
+
+    def EstimateTotalHeight(*args, **kwargs):
+        """EstimateTotalHeight(self) -> int"""
+        return _windows_.HVScrolledWindow_EstimateTotalHeight(*args, **kwargs)
+
+    def GetColumnsWidth(*args, **kwargs):
+        """GetColumnsWidth(self, size_t columnMin, size_t columnMax) -> int"""
+        return _windows_.HVScrolledWindow_GetColumnsWidth(*args, **kwargs)
+
+    def EstimateTotalWidth(*args, **kwargs):
+        """EstimateTotalWidth(self) -> int"""
+        return _windows_.HVScrolledWindow_EstimateTotalWidth(*args, **kwargs)
+
+_windows_.HVScrolledWindow_swigregister(HVScrolledWindow)
+
+def PreHVScrolledWindow(*args, **kwargs):
+    """PreHVScrolledWindow() -> HVScrolledWindow"""
+    val = _windows_.new_PreHVScrolledWindow(*args, **kwargs)
     return val
 
 class VListBox(VScrolledWindow):
@@ -1913,7 +2195,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)"""
@@ -2010,6 +2292,10 @@ class VListBox(VScrolledWindow):
         """SetSelectionBackground(self, Colour col)"""
         return _windows_.VListBox_SetSelectionBackground(*args, **kwargs)
 
+    def RefreshSelected(*args, **kwargs):
+        """RefreshSelected(self)"""
+        return _windows_.VListBox_RefreshSelected(*args, **kwargs)
+
     def OnDrawSeparator(*args, **kwargs):
         """OnDrawSeparator(self, DC dc, Rect rect, size_t n)"""
         return _windows_.VListBox_OnDrawSeparator(*args, **kwargs)
@@ -2042,7 +2328,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)"""
@@ -2075,6 +2361,41 @@ def PreHtmlListBox(*args, **kwargs):
     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):
@@ -2084,12 +2405,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):
@@ -2140,6 +2461,7 @@ wxEVT_TASKBAR_RIGHT_DOWN = _windows_.wxEVT_TASKBAR_RIGHT_DOWN
 wxEVT_TASKBAR_RIGHT_UP = _windows_.wxEVT_TASKBAR_RIGHT_UP
 wxEVT_TASKBAR_LEFT_DCLICK = _windows_.wxEVT_TASKBAR_LEFT_DCLICK
 wxEVT_TASKBAR_RIGHT_DCLICK = _windows_.wxEVT_TASKBAR_RIGHT_DCLICK
+wxEVT_TASKBAR_CLICK = _windows_.wxEVT_TASKBAR_CLICK
 EVT_TASKBAR_MOVE = wx.PyEventBinder (         wxEVT_TASKBAR_MOVE )
 EVT_TASKBAR_LEFT_DOWN = wx.PyEventBinder (    wxEVT_TASKBAR_LEFT_DOWN )
 EVT_TASKBAR_LEFT_UP = wx.PyEventBinder (      wxEVT_TASKBAR_LEFT_UP )
@@ -2147,6 +2469,7 @@ EVT_TASKBAR_RIGHT_DOWN = wx.PyEventBinder (   wxEVT_TASKBAR_RIGHT_DOWN )
 EVT_TASKBAR_RIGHT_UP = wx.PyEventBinder (     wxEVT_TASKBAR_RIGHT_UP )
 EVT_TASKBAR_LEFT_DCLICK = wx.PyEventBinder (  wxEVT_TASKBAR_LEFT_DCLICK )
 EVT_TASKBAR_RIGHT_DCLICK = wx.PyEventBinder ( wxEVT_TASKBAR_RIGHT_DCLICK )
+EVT_TASKBAR_CLICK =  wx.PyEventBinder (       wxEVT_TASKBAR_CLICK )
 
 #---------------------------------------------------------------------------
 
@@ -2267,9 +2590,10 @@ def GetColourFromUser(*args, **kwargs):
         String caption=EmptyString) -> Colour
     """
   return _windows_.GetColourFromUser(*args, **kwargs)
+DD_CHANGE_DIR = _windows_.DD_CHANGE_DIR
+DD_DIR_MUST_EXIST = _windows_.DD_DIR_MUST_EXIST
 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
@@ -2325,13 +2649,6 @@ class DirDialog(Dialog):
     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
@@ -2340,6 +2657,14 @@ FD_MULTIPLE = _windows_.FD_MULTIPLE
 FD_CHANGE_DIR = _windows_.FD_CHANGE_DIR
 FD_PREVIEW = _windows_.FD_PREVIEW
 FD_DEFAULT_STYLE = _windows_.FD_DEFAULT_STYLE
+# deprecated names
+OPEN              = FD_OPEN
+SAVE              = FD_SAVE
+OVERWRITE_PROMPT  = FD_OVERWRITE_PROMPT
+FILE_MUST_EXIST   = FD_FILE_MUST_EXIST
+MULTIPLE          = FD_MULTIPLE
+CHANGE_DIR        = FD_CHANGE_DIR
+
 class FileDialog(Dialog):
     """
     wx.FileDialog allows the user to select one or more files from the
@@ -3282,16 +3607,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)
@@ -3462,16 +3784,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)
@@ -3642,16 +3961,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)
@@ -3858,6 +4174,10 @@ class PrintData(_core.Object):
         """GetOrientation(self) -> int"""
         return _windows_.PrintData_GetOrientation(*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)
@@ -3895,6 +4215,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)
@@ -3907,6 +4231,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)
@@ -3939,6 +4267,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)
@@ -4383,7 +4715,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;
@@ -4403,6 +4735,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)
@@ -4435,6 +4815,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)
@@ -4744,7 +5132,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)"""
@@ -4798,7 +5186,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)"""
@@ -4852,7 +5240,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)"""