fixes for compilation with wxUSE_XXX==0 and some other minor fixes (patch 1569904)

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

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index a978b3cd4ccc8ec79b8fdda2ecf4440efa968ec8..2378a5c9481aa855f1b839ce04dc2f19e9298727 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -273,6 +273,9 @@ def SystemOptions_IsFalse(*args, **kwargs):
   """SystemOptions_IsFalse(String name) -> bool"""
   return _misc_.SystemOptions_IsFalse(*args, **kwargs)
 
   """SystemOptions_IsFalse(String name) -> bool"""
   return _misc_.SystemOptions_IsFalse(*args, **kwargs)
 

+# Until the new native control for wxMac is up to par, still use the generic one.
+SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1)
+

 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------
 
 


@@ -791,6 +794,8 @@ class ToolTip(_core.Object):
         return _misc_.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)
         return _misc_.ToolTip_SetDelay(*args, **kwargs)
 
     SetDelay = staticmethod(SetDelay)

+    Tip = property(GetTip,SetTip,doc="See `GetTip` and `SetTip`") 
+    Window = property(GetWindow,doc="See `GetWindow`") 

 _misc_.ToolTip_swigregister(ToolTip)
 
 def ToolTip_Enable(*args, **kwargs):
 _misc_.ToolTip_swigregister(ToolTip)
 
 def ToolTip_Enable(*args, **kwargs):


@@ -1106,6 +1111,10 @@ class PlatformInformation(object):
         """GetOSMinorVersion(self) -> int"""
         return _misc_.PlatformInformation_GetOSMinorVersion(*args, **kwargs)
 
         """GetOSMinorVersion(self) -> int"""
         return _misc_.PlatformInformation_GetOSMinorVersion(*args, **kwargs)
 

+    def CheckOSVersion(*args, **kwargs):
+        """CheckOSVersion(self, int major, int minor) -> bool"""
+        return _misc_.PlatformInformation_CheckOSVersion(*args, **kwargs)
+

     def GetToolkitMajorVersion(*args, **kwargs):
         """GetToolkitMajorVersion(self) -> int"""
         return _misc_.PlatformInformation_GetToolkitMajorVersion(*args, **kwargs)
     def GetToolkitMajorVersion(*args, **kwargs):
         """GetToolkitMajorVersion(self) -> int"""
         return _misc_.PlatformInformation_GetToolkitMajorVersion(*args, **kwargs)


@@ -1114,6 +1123,10 @@ class PlatformInformation(object):
         """GetToolkitMinorVersion(self) -> int"""
         return _misc_.PlatformInformation_GetToolkitMinorVersion(*args, **kwargs)
 
         """GetToolkitMinorVersion(self) -> int"""
         return _misc_.PlatformInformation_GetToolkitMinorVersion(*args, **kwargs)
 

+    def CheckToolkitVersion(*args, **kwargs):
+        """CheckToolkitVersion(self, int major, int minor) -> bool"""
+        return _misc_.PlatformInformation_CheckToolkitVersion(*args, **kwargs)
+

     def IsUsingUniversalWidgets(*args, **kwargs):
         """IsUsingUniversalWidgets(self) -> bool"""
         return _misc_.PlatformInformation_IsUsingUniversalWidgets(*args, **kwargs)
     def IsUsingUniversalWidgets(*args, **kwargs):
         """IsUsingUniversalWidgets(self) -> bool"""
         return _misc_.PlatformInformation_IsUsingUniversalWidgets(*args, **kwargs)


@@ -1227,6 +1240,8 @@ class TipProvider(object):
         """PreprocessTip(self, String tip) -> String"""
         return _misc_.TipProvider_PreprocessTip(*args, **kwargs)
 
         """PreprocessTip(self, String tip) -> String"""
         return _misc_.TipProvider_PreprocessTip(*args, **kwargs)
 

+    CurrentTip = property(GetCurrentTip,doc="See `GetCurrentTip`") 
+    Tip = property(GetTip,doc="See `GetTip`") 

 _misc_.TipProvider_swigregister(TipProvider)
 
 class PyTipProvider(TipProvider):
 _misc_.TipProvider_swigregister(TipProvider)
 
 class PyTipProvider(TipProvider):


@@ -1312,6 +1327,9 @@ class Timer(_core.EvtHandler):
         """NO-OP: Timers must be destroyed by normal reference counting"""
         pass
 
         """NO-OP: Timers must be destroyed by normal reference counting"""
         pass
 

+    Id = property(GetId,doc="See `GetId`") 
+    Interval = property(GetInterval,doc="See `GetInterval`") 
+    Owner = property(GetOwner,SetOwner,doc="See `GetOwner` and `SetOwner`") 

 _misc_.Timer_swigregister(Timer)
 
 # For backwards compatibility with 2.4
 _misc_.Timer_swigregister(Timer)
 
 # For backwards compatibility with 2.4


@@ -1339,6 +1357,7 @@ class TimerEvent(_core.Event):
         """GetInterval(self) -> int"""
         return _misc_.TimerEvent_GetInterval(*args, **kwargs)
 
         """GetInterval(self) -> int"""
         return _misc_.TimerEvent_GetInterval(*args, **kwargs)
 

+    Interval = property(GetInterval,doc="See `GetInterval`") 

 _misc_.TimerEvent_swigregister(TimerEvent)
 
 class TimerRunner(object):
 _misc_.TimerEvent_swigregister(TimerEvent)
 
 class TimerRunner(object):


@@ -2588,7 +2607,7 @@ class ArtProvider(object):
     their own wx.ArtProvider class and easily replace standard art with
     his/her own version. It is easy thing to do: all that is needed is
     to derive a class from wx.ArtProvider, override it's CreateBitmap
     their own wx.ArtProvider class and easily replace standard art with
     his/her own version. It is easy thing to do: all that is needed is
     to derive a class from wx.ArtProvider, override it's CreateBitmap

-    method and register the provider with wx.ArtProvider.PushProvider::
+    method and register the provider with `wx.ArtProvider.Push`::

 
         class MyArtProvider(wx.ArtProvider):
             def __init__(self):
 
         class MyArtProvider(wx.ArtProvider):
             def __init__(self):


@@ -2612,7 +2631,7 @@ class ArtProvider(object):
         their own wx.ArtProvider class and easily replace standard art with
         his/her own version. It is easy thing to do: all that is needed is
         to derive a class from wx.ArtProvider, override it's CreateBitmap
         their own wx.ArtProvider class and easily replace standard art with
         his/her own version. It is easy thing to do: all that is needed is
         to derive a class from wx.ArtProvider, override it's CreateBitmap

-        method and register the provider with wx.ArtProvider.PushProvider::
+        method and register the provider with `wx.ArtProvider.Push`::

 
             class MyArtProvider(wx.ArtProvider):
                 def __init__(self):
 
             class MyArtProvider(wx.ArtProvider):
                 def __init__(self):


@@ -2632,45 +2651,49 @@ class ArtProvider(object):
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
 
         """_setCallbackInfo(self, PyObject self, PyObject _class)"""
         return _misc_.ArtProvider__setCallbackInfo(*args, **kwargs)
 

-    def PushProvider(*args, **kwargs):
+    def Push(*args, **kwargs):

         """
         """

-        PushProvider(ArtProvider provider)
+        Push(ArtProvider provider)

 
         Add new provider to the top of providers stack.
         """
 
         Add new provider to the top of providers stack.
         """

-        return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+        return _misc_.ArtProvider_Push(*args, **kwargs)

 
 

-    PushProvider = staticmethod(PushProvider)
-    def InsertProvider(*args, **kwargs):
+    Push = staticmethod(Push)
+    PushProvider = wx._deprecated(Push, "See `Push`") 
+    def Insert(*args, **kwargs):

         """
         """

-        InsertProvider(ArtProvider provider)
+        Insert(ArtProvider provider)

 
         Add new provider to the bottom of providers stack.
         """
 
         Add new provider to the bottom of providers stack.
         """

-        return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+        return _misc_.ArtProvider_Insert(*args, **kwargs)

 
 

-    InsertProvider = staticmethod(InsertProvider)
-    def PopProvider(*args, **kwargs):
+    Insert = staticmethod(Insert)
+    InsertProvider = wx._deprecated(Insert, "See `Insert`") 
+    def Pop(*args, **kwargs):

         """
         """

-        PopProvider() -> bool
+        Pop() -> bool

 
         Remove latest added provider and delete it.
         """
 
         Remove latest added provider and delete it.
         """

-        return _misc_.ArtProvider_PopProvider(*args, **kwargs)
+        return _misc_.ArtProvider_Pop(*args, **kwargs)

 
 

-    PopProvider = staticmethod(PopProvider)
-    def RemoveProvider(*args, **kwargs):
+    Pop = staticmethod(Pop)
+    PopProvider = wx._deprecated(Pop, "See `Pop`") 
+    def Delete(*args, **kwargs):

         """
         """

-        RemoveProvider(ArtProvider provider) -> bool
+        Delete(ArtProvider provider) -> bool

 
         Remove provider. The provider must have been added previously!  The
         provider is _not_ deleted.
         """
 
         Remove provider. The provider must have been added previously!  The
         provider is _not_ deleted.
         """

-        val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+        val = _misc_.ArtProvider_Delete(*args, **kwargs)

         args[1].thisown = 1
         return val
 
         args[1].thisown = 1
         return val
 

-    RemoveProvider = staticmethod(RemoveProvider)
+    Delete = staticmethod(Delete)
+    RemoveProvider = wx._deprecated(Delete, "See `Delete`") 

     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap
     def GetBitmap(*args, **kwargs):
         """
         GetBitmap(String id, String client=ART_OTHER, Size size=DefaultSize) -> Bitmap


@@ -2765,38 +2788,38 @@ ART_QUIT = cvar.ART_QUIT
 ART_FIND = cvar.ART_FIND
 ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE
 
 ART_FIND = cvar.ART_FIND
 ART_FIND_AND_REPLACE = cvar.ART_FIND_AND_REPLACE
 

-def ArtProvider_PushProvider(*args, **kwargs):
+def ArtProvider_Push(*args, **kwargs):

   """
   """

-    ArtProvider_PushProvider(ArtProvider provider)
+    ArtProvider_Push(ArtProvider provider)

 
     Add new provider to the top of providers stack.
     """
 
     Add new provider to the top of providers stack.
     """

-  return _misc_.ArtProvider_PushProvider(*args, **kwargs)
+  return _misc_.ArtProvider_Push(*args, **kwargs)

 
 

-def ArtProvider_InsertProvider(*args, **kwargs):
+def ArtProvider_Insert(*args, **kwargs):

   """
   """

-    ArtProvider_InsertProvider(ArtProvider provider)
+    ArtProvider_Insert(ArtProvider provider)

 
     Add new provider to the bottom of providers stack.
     """
 
     Add new provider to the bottom of providers stack.
     """

-  return _misc_.ArtProvider_InsertProvider(*args, **kwargs)
+  return _misc_.ArtProvider_Insert(*args, **kwargs)

 
 

-def ArtProvider_PopProvider(*args):
+def ArtProvider_Pop(*args):

   """
   """

-    ArtProvider_PopProvider() -> bool
+    ArtProvider_Pop() -> bool

 
     Remove latest added provider and delete it.
     """
 
     Remove latest added provider and delete it.
     """

-  return _misc_.ArtProvider_PopProvider(*args)
+  return _misc_.ArtProvider_Pop(*args)

 
 

-def ArtProvider_RemoveProvider(*args, **kwargs):
+def ArtProvider_Delete(*args, **kwargs):

   """
   """

-    ArtProvider_RemoveProvider(ArtProvider provider) -> bool
+    ArtProvider_Delete(ArtProvider provider) -> bool

 
     Remove provider. The provider must have been added previously!  The
     provider is _not_ deleted.
     """
 
     Remove provider. The provider must have been added previously!  The
     provider is _not_ deleted.
     """

-  val = _misc_.ArtProvider_RemoveProvider(*args, **kwargs)
+  val = _misc_.ArtProvider_Delete(*args, **kwargs)

   args[1].thisown = 1
   return val
 
   args[1].thisown = 1
   return val
 


@@ -4325,6 +4348,12 @@ class TimeSpan(object):
     def __str__(self):
         return self.Format().encode(wx.GetDefaultPyEncoding())
 
     def __str__(self):
         return self.Format().encode(wx.GetDefaultPyEncoding())
 

+    Days = property(GetDays,doc="See `GetDays`") 
+    Hours = property(GetHours,doc="See `GetHours`") 
+    Milliseconds = property(GetMilliseconds,doc="See `GetMilliseconds`") 
+    Minutes = property(GetMinutes,doc="See `GetMinutes`") 
+    Seconds = property(GetSeconds,doc="See `GetSeconds`") 
+    Weeks = property(GetWeeks,doc="See `GetWeeks`") 

 _misc_.TimeSpan_swigregister(TimeSpan)
 
 def TimeSpan_Milliseconds(*args, **kwargs):
 _misc_.TimeSpan_swigregister(TimeSpan)
 
 def TimeSpan_Milliseconds(*args, **kwargs):


@@ -4982,6 +5011,8 @@ class TextDataObject(DataObjectSimple):
         """
         return _misc_.TextDataObject_SetText(*args, **kwargs)
 
         """
         return _misc_.TextDataObject_SetText(*args, **kwargs)
 

+    Text = property(GetText,SetText,doc="See `GetText` and `SetText`") 
+    TextLength = property(GetTextLength,doc="See `GetTextLength`") 

 _misc_.TextDataObject_swigregister(TextDataObject)
 
 class PyTextDataObject(TextDataObject):
 _misc_.TextDataObject_swigregister(TextDataObject)
 
 class PyTextDataObject(TextDataObject):


@@ -5200,6 +5231,7 @@ class URLDataObject(DataObject):
         """
         return _misc_.URLDataObject_SetURL(*args, **kwargs)
 
         """
         return _misc_.URLDataObject_SetURL(*args, **kwargs)
 

+    URL = property(GetURL,SetURL,doc="See `GetURL` and `SetURL`") 

 _misc_.URLDataObject_swigregister(URLDataObject)
 
 class MetafileDataObject(DataObjectSimple):
 _misc_.URLDataObject_swigregister(URLDataObject)
 
 class MetafileDataObject(DataObjectSimple):


@@ -5769,6 +5801,9 @@ class VideoMode(object):
     h = property(_misc_.VideoMode_h_get, _misc_.VideoMode_h_set)
     bpp = property(_misc_.VideoMode_bpp_get, _misc_.VideoMode_bpp_set)
     refresh = property(_misc_.VideoMode_refresh_get, _misc_.VideoMode_refresh_set)
     h = property(_misc_.VideoMode_h_get, _misc_.VideoMode_h_set)
     bpp = property(_misc_.VideoMode_bpp_get, _misc_.VideoMode_bpp_set)
     refresh = property(_misc_.VideoMode_refresh_get, _misc_.VideoMode_refresh_set)

+    Depth = property(GetDepth,doc="See `GetDepth`") 
+    Height = property(GetHeight,doc="See `GetHeight`") 
+    Width = property(GetWidth,doc="See `GetWidth`") 

 _misc_.VideoMode_swigregister(VideoMode)
 
 class Display(object):
 _misc_.VideoMode_swigregister(VideoMode)
 
 class Display(object):


@@ -5777,7 +5812,7 @@ class Display(object):
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """
     __repr__ = _swig_repr
     def __init__(self, *args, **kwargs): 
         """

-        __init__(self, size_t index=0) -> Display
+        __init__(self, unsigned int index=0) -> Display

 
         Set up a Display instance with the specified display.  The displays
         are numbered from 0 to GetCount() - 1, 0 is always the primary display
 
         Set up a Display instance with the specified display.  The displays
         are numbered from 0 to GetCount() - 1, 0 is always the primary display


@@ -5788,7 +5823,7 @@ class Display(object):
     __del__ = lambda self : None;
     def GetCount(*args, **kwargs):
         """
     __del__ = lambda self : None;
     def GetCount(*args, **kwargs):
         """

-        GetCount() -> size_t
+        GetCount() -> unsigned int

 
         Return the number of available displays.
         """
 
         Return the number of available displays.
         """


@@ -5922,7 +5957,7 @@ DefaultVideoMode = cvar.DefaultVideoMode
 
 def Display_GetCount(*args):
   """
 
 def Display_GetCount(*args):
   """

-    Display_GetCount() -> size_t
+    Display_GetCount() -> unsigned int

 
     Return the number of available displays.
     """
 
     Return the number of available displays.
     """