X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/994453b843b007de6367fedbf4a49ac9d920c63c..8bd3541321152b1f2997124d77246d43bf4de3fb:/wxPython/src/mac/_controls.py

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index e0b9124bbc..1470fd5dd2 100644
--- a/wxPython/src/mac/_controls.py
+++ b/wxPython/src/mac/_controls.py
@@ -678,7 +678,7 @@ class ComboBox(_core.Control,_core.ItemContainer):
         return _controls_.ComboBox_SetMark(*args, **kwargs)
 
     def GetMark(self):
-        raise NotImplementedError
+        return (0,0)
 
     def GetCurrentSelection(*args, **kwargs):
         """
@@ -1525,6 +1525,7 @@ TE_HT_BELOW = _controls_.TE_HT_BELOW
 TE_HT_BEYOND = _controls_.TE_HT_BEYOND
 OutOfRangeTextCoord = _controls_.OutOfRangeTextCoord
 InvalidTextCoord = _controls_.InvalidTextCoord
+TEXT_TYPE_ANY = _controls_.TEXT_TYPE_ANY
 class TextAttr(object):
     """Proxy of C++ TextAttr class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -1706,6 +1707,14 @@ class TextCtrl(_core.Control):
         """SetValue(self, String value)"""
         return _controls_.TextCtrl_SetValue(*args, **kwargs)
 
+    def IsEmpty(*args, **kwargs):
+        """IsEmpty(self) -> bool"""
+        return _controls_.TextCtrl_IsEmpty(*args, **kwargs)
+
+    def ChangeValue(*args, **kwargs):
+        """ChangeValue(self, String value)"""
+        return _controls_.TextCtrl_ChangeValue(*args, **kwargs)
+
     def GetRange(*args, **kwargs):
         """GetRange(self, long from, long to) -> String"""
         return _controls_.TextCtrl_GetRange(*args, **kwargs)
@@ -1763,11 +1772,11 @@ class TextCtrl(_core.Control):
         return _controls_.TextCtrl_Remove(*args, **kwargs)
 
     def LoadFile(*args, **kwargs):
-        """LoadFile(self, String file) -> bool"""
+        """LoadFile(self, String file, int fileType=TEXT_TYPE_ANY) -> bool"""
         return _controls_.TextCtrl_LoadFile(*args, **kwargs)
 
     def SaveFile(*args, **kwargs):
-        """SaveFile(self, String file=EmptyString) -> bool"""
+        """SaveFile(self, String file=EmptyString, int fileType=TEXT_TYPE_ANY) -> bool"""
         return _controls_.TextCtrl_SaveFile(*args, **kwargs)
 
     def MarkDirty(*args, **kwargs):
@@ -1914,6 +1923,10 @@ class TextCtrl(_core.Control):
         """SetEditable(self, bool editable)"""
         return _controls_.TextCtrl_SetEditable(*args, **kwargs)
 
+    def SendTextUpdatedEvent(*args, **kwargs):
+        """SendTextUpdatedEvent(self)"""
+        return _controls_.TextCtrl_SendTextUpdatedEvent(*args, **kwargs)
+
     def write(*args, **kwargs):
         """write(self, String text)"""
         return _controls_.TextCtrl_write(*args, **kwargs)
@@ -2946,6 +2959,10 @@ class BookCtrlBase(_core.Control):
         """SetSelection(self, size_t n) -> int"""
         return _controls_.BookCtrlBase_SetSelection(*args, **kwargs)
 
+    def ChangeSelection(*args, **kwargs):
+        """ChangeSelection(self, size_t n) -> int"""
+        return _controls_.BookCtrlBase_ChangeSelection(*args, **kwargs)
+
     def AdvanceSelection(*args, **kwargs):
         """AdvanceSelection(self, bool forward=True)"""
         return _controls_.BookCtrlBase_AdvanceSelection(*args, **kwargs)
@@ -3110,6 +3127,14 @@ class Notebook(BookCtrlBase):
         return _controls_.Notebook_GetClassDefaultAttributes(*args, **kwargs)
 
     GetClassDefaultAttributes = staticmethod(GetClassDefaultAttributes)
+    def SendPageChangingEvent(*args, **kwargs):
+        """SendPageChangingEvent(self, int nPage) -> bool"""
+        return _controls_.Notebook_SendPageChangingEvent(*args, **kwargs)
+
+    def SendPageChangedEvent(*args, **kwargs):
+        """SendPageChangedEvent(self, int nPageOld, int nPageNew=-1)"""
+        return _controls_.Notebook_SendPageChangedEvent(*args, **kwargs)
+
     RowCount = property(GetRowCount,doc="See `GetRowCount`") 
     ThemeBackgroundColour = property(GetThemeBackgroundColour,doc="See `GetThemeBackgroundColour`") 
 _controls_.Notebook_swigregister(Notebook)
@@ -3439,6 +3464,10 @@ TOOL_STYLE_SEPARATOR = _controls_.TOOL_STYLE_SEPARATOR
 TOOL_STYLE_CONTROL = _controls_.TOOL_STYLE_CONTROL
 TB_HORIZONTAL = _controls_.TB_HORIZONTAL
 TB_VERTICAL = _controls_.TB_VERTICAL
+TB_TOP = _controls_.TB_TOP
+TB_LEFT = _controls_.TB_LEFT
+TB_BOTTOM = _controls_.TB_BOTTOM
+TB_RIGHT = _controls_.TB_RIGHT
 TB_3DBUTTONS = _controls_.TB_3DBUTTONS
 TB_FLAT = _controls_.TB_FLAT
 TB_DOCKABLE = _controls_.TB_DOCKABLE
@@ -4109,9 +4138,8 @@ class ListItemAttr(object):
 
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
-        val = _controls_.ListItemAttr_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _controls_.ListItemAttr_Destroy(*args, **kwargs)
 
     BackgroundColour = property(GetBackgroundColour,SetBackgroundColour,doc="See `GetBackgroundColour` and `SetBackgroundColour`") 
     Font = property(GetFont,SetFont,doc="See `GetFont` and `SetFont`") 
@@ -4997,9 +5025,8 @@ class TreeItemData(object):
 
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
-        val = _controls_.TreeItemData_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _controls_.TreeItemData_Destroy(*args, **kwargs)
 
     Data = property(GetData,SetData,doc="See `GetData` and `SetData`") 
     Id = property(GetId,SetId,doc="See `GetId` and `SetId`") 
@@ -5654,7 +5681,6 @@ class GenericDirCtrl(_core.Control):
     FilterListCtrl = property(GetFilterListCtrl,doc="See `GetFilterListCtrl`") 
     Path = property(GetPath,SetPath,doc="See `GetPath` and `SetPath`") 
     RootId = property(GetRootId,doc="See `GetRootId`") 
-    ShowHidden = property(GetShowHidden,ShowHidden,doc="See `GetShowHidden` and `ShowHidden`") 
     TreeCtrl = property(GetTreeCtrl,doc="See `GetTreeCtrl`") 
 _controls_.GenericDirCtrl_swigregister(GenericDirCtrl)
 DirDialogDefaultFolderStr = cvar.DirDialogDefaultFolderStr
@@ -5713,10 +5739,7 @@ class PyControl(_core.Control):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _controls_.PyControl__setCallbackInfo(*args, **kwargs)
 
-    def SetBestSize(*args, **kwargs):
-        """SetBestSize(self, Size size)"""
-        return _controls_.PyControl_SetBestSize(*args, **kwargs)
-
+    SetBestSize = wx.Window.SetInitialSize 
     def DoEraseBackground(*args, **kwargs):
         """DoEraseBackground(self, DC dc) -> bool"""
         return _controls_.PyControl_DoEraseBackground(*args, **kwargs)
@@ -6170,9 +6193,8 @@ class HelpProvider(object):
 
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
-        val = _controls_.HelpProvider_Destroy(*args, **kwargs)
-        args[0].thisown = 0
-        return val
+        args[0].this.own(False)
+        return _controls_.HelpProvider_Destroy(*args, **kwargs)
 
 _controls_.HelpProvider_swigregister(HelpProvider)
 
@@ -6917,7 +6939,7 @@ class FontPickerCtrl(PickerBase):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
-        __init__(self, Window parent, int id=-1, Font initial=*wxNORMAL_FONT, 
+        __init__(self, Window parent, int id=-1, Font initial=wxNullFont, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=FNTP_DEFAULT_STYLE, Validator validator=DefaultValidator, 
             String name=FontPickerCtrlNameStr) -> FontPickerCtrl
@@ -6927,7 +6949,7 @@ class FontPickerCtrl(PickerBase):
 
     def Create(*args, **kwargs):
         """
-        Create(self, Window parent, int id=-1, Font initial=*wxNORMAL_FONT, 
+        Create(self, Window parent, int id=-1, Font initial=wxNullFont, 
             Point pos=DefaultPosition, Size size=DefaultSize, 
             long style=FNTP_DEFAULT_STYLE, Validator validator=DefaultValidator, 
             String name=FontPickerCtrlNameStr) -> bool