X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b39fe9514578dc76bd595e243e88e412be70bb61..ad3a156e18c0d5adae80b79cf382bca28546b4d9:/wxPython/src/mac/_controls.py?ds=sidebyside

diff --git a/wxPython/src/mac/_controls.py b/wxPython/src/mac/_controls.py
index 1c778bb1b9..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):
         """
@@ -3464,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
@@ -3474,7 +3478,6 @@ TB_NOALIGN = _controls_.TB_NOALIGN
 TB_HORZ_LAYOUT = _controls_.TB_HORZ_LAYOUT
 TB_HORZ_TEXT = _controls_.TB_HORZ_TEXT
 TB_NO_TOOLTIPS = _controls_.TB_NO_TOOLTIPS
-TB_BOTTOM = _controls_.TB_BOTTOM
 class ToolBarToolBase(_core.Object):
     """Proxy of C++ ToolBarToolBase class"""
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
@@ -5678,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
@@ -5737,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)
@@ -6940,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
@@ -6950,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