X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/00360d4699d23a01c1c62d5d1c128bd9739a239d..8d5eff606ae62a36ea2ccecc017a810081cdc22d:/wxPython/src/mac/wx.py?ds=inline

diff --git a/wxPython/src/mac/wx.py b/wxPython/src/mac/wx.py
index 65cb308f90..1204852c8d 100644
--- a/wxPython/src/mac/wx.py
+++ b/wxPython/src/mac/wx.py
@@ -243,6 +243,7 @@ wxTE_READONLY = wxc.wxTE_READONLY
 wxTE_MULTILINE = wxc.wxTE_MULTILINE
 wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
 wxTE_RICH = wxc.wxTE_RICH
+wxTE_RICH2 = wxc.wxTE_RICH2
 wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
 wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
 wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
@@ -354,6 +355,7 @@ wxID_HELP_CONTENTS = wxc.wxID_HELP_CONTENTS
 wxID_HELP_COMMANDS = wxc.wxID_HELP_COMMANDS
 wxID_HELP_PROCEDURES = wxc.wxID_HELP_PROCEDURES
 wxID_HELP_CONTEXT = wxc.wxID_HELP_CONTEXT
+wxID_CLOSE_ALL = wxc.wxID_CLOSE_ALL
 wxID_CUT = wxc.wxID_CUT
 wxID_COPY = wxc.wxID_COPY
 wxID_PASTE = wxc.wxID_PASTE
@@ -634,6 +636,7 @@ wxBITMAP_TYPE_PICT = wxc.wxBITMAP_TYPE_PICT
 wxBITMAP_TYPE_PICT_RESOURCE = wxc.wxBITMAP_TYPE_PICT_RESOURCE
 wxBITMAP_TYPE_ICON = wxc.wxBITMAP_TYPE_ICON
 wxBITMAP_TYPE_ICON_RESOURCE = wxc.wxBITMAP_TYPE_ICON_RESOURCE
+wxBITMAP_TYPE_ANI = wxc.wxBITMAP_TYPE_ANI
 wxBITMAP_TYPE_MACCURSOR = wxc.wxBITMAP_TYPE_MACCURSOR
 wxBITMAP_TYPE_MACCURSOR_RESOURCE = wxc.wxBITMAP_TYPE_MACCURSOR_RESOURCE
 wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
@@ -1438,12 +1441,6 @@ class wxTimer(wxPyTimer):
             wxPyTimer.__init__(self, None)
             self.SetOwner(evtHandler, id)
 
-#----------------------------------------------------------------------
-
-NULL = None  # For backwards compatibility only.  You should really be
-             # using None now.
-
-
 #----------------------------------------------------------------------
 # aliases
 
@@ -1455,7 +1452,10 @@ wxPen        = wxPyPen
 wxNoRefBitmap       = wxBitmap
 wxPyDefaultPosition = wxDefaultPosition
 wxPyDefaultSize     = wxDefaultSize
-
+NULL                = None
+wxSystemSettings_GetSystemColour = wxSystemSettings_GetColour
+wxSystemSettings_GetSystemFont   = wxSystemSettings_GetFont
+wxSystemSettings_GetSystemMetric = wxSystemSettings_GetMetric
 
 #----------------------------------------------------------------------
 # wxGTK sets the locale when initialized.  Doing this at the Python