Modified form of Patch #1611222, adds wxSearchCtrl (generic & native carbon HISearchF...

[wxWidgets.git] / wxPython / src / mac / _windows.py

diff --git a/wxPython/src/mac/_windows.py b/wxPython/src/mac/_windows.py
index ecf63a52bff80a3011f6e0b3acb75fc9099923b0..6889b3be2ab8991dda1597ff6078a5bf8ddb2dda 100644 (file)
--- a/wxPython/src/mac/_windows.py
+++ b/wxPython/src/mac/_windows.py
@@ -1791,7 +1791,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)"""
@@ -1894,7 +1894,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)"""
@@ -2023,7 +2023,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)"""
@@ -2056,6 +2056,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):
@@ -2065,12 +2100,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):
@@ -3263,7 +3298,7 @@ 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)"""
@@ -3440,7 +3475,7 @@ 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)"""
@@ -3617,7 +3652,7 @@ 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)"""
@@ -3830,6 +3865,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)
@@ -3883,6 +3922,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)
@@ -4363,7 +4406,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;
@@ -4780,7 +4823,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)"""
@@ -4834,7 +4877,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)"""
@@ -4888,7 +4931,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)"""