Fix CYGWIN socket compilo

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

diff --git a/wxPython/src/mac/_misc.py b/wxPython/src/mac/_misc.py
index 6545bb4c8bc85bc47eb06555a89094984cca45f5..cca3a2664c68c883aa85e467c056e37830216fa4 100644 (file)
--- a/wxPython/src/mac/_misc.py
+++ b/wxPython/src/mac/_misc.py
@@ -155,7 +155,7 @@ class SystemSettings(object):
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):
 
     GetFont = staticmethod(GetFont)
     def GetMetric(*args, **kwargs):

-        """GetMetric(int index) -> int"""
+        """GetMetric(int index, Window win=None) -> int"""

         return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)
         return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
     GetMetric = staticmethod(GetMetric)


@@ -191,7 +191,7 @@ def SystemSettings_GetFont(*args, **kwargs):
     return _misc_.SystemSettings_GetFont(*args, **kwargs)
 
 def SystemSettings_GetMetric(*args, **kwargs):
     return _misc_.SystemSettings_GetFont(*args, **kwargs)
 
 def SystemSettings_GetMetric(*args, **kwargs):

-    """SystemSettings_GetMetric(int index) -> int"""
+    """SystemSettings_GetMetric(int index, Window win=None) -> int"""

     return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
 def SystemSettings_HasFeature(*args, **kwargs):
     return _misc_.SystemSettings_GetMetric(*args, **kwargs)
 
 def SystemSettings_HasFeature(*args, **kwargs):


@@ -241,6 +241,11 @@ class SystemOptions(_core.Object):
         return _misc_.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)
         return _misc_.SystemOptions_HasOption(*args, **kwargs)
 
     HasOption = staticmethod(HasOption)

+    def IsFalse(*args, **kwargs):
+        """IsFalse(String name) -> bool"""
+        return _misc_.SystemOptions_IsFalse(*args, **kwargs)
+
+    IsFalse = staticmethod(IsFalse)

 
 class SystemOptionsPtr(SystemOptions):
     def __init__(self, this):
 
 class SystemOptionsPtr(SystemOptions):
     def __init__(self, this):


@@ -271,6 +276,10 @@ def SystemOptions_HasOption(*args, **kwargs):
     """SystemOptions_HasOption(String name) -> bool"""
     return _misc_.SystemOptions_HasOption(*args, **kwargs)
 
     """SystemOptions_HasOption(String name) -> bool"""
     return _misc_.SystemOptions_HasOption(*args, **kwargs)
 

+def SystemOptions_IsFalse(*args, **kwargs):
+    """SystemOptions_IsFalse(String name) -> bool"""
+    return _misc_.SystemOptions_IsFalse(*args, **kwargs)
+

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


@@ -2548,6 +2557,16 @@ class ArtProvider(object):
         return _misc_.ArtProvider_GetIcon(*args, **kwargs)
 
     GetIcon = staticmethod(GetIcon)
         return _misc_.ArtProvider_GetIcon(*args, **kwargs)
 
     GetIcon = staticmethod(GetIcon)

+    def GetSizeHint(*args, **kwargs):
+        """
+        GetSizeHint(String client, bool platform_dependent=False) -> Size
+
+        Get the size hint of an icon from a specific Art Client, queries the
+        topmost provider if platform_dependent = false
+        """
+        return _misc_.ArtProvider_GetSizeHint(*args, **kwargs)
+
+    GetSizeHint = staticmethod(GetSizeHint)

     def Destroy(*args, **kwargs):
         """Destroy(self)"""
         return _misc_.ArtProvider_Destroy(*args, **kwargs)
     def Destroy(*args, **kwargs):
         """Destroy(self)"""
         return _misc_.ArtProvider_Destroy(*args, **kwargs)


@@ -2658,6 +2677,15 @@ def ArtProvider_GetIcon(*args, **kwargs):
     """
     return _misc_.ArtProvider_GetIcon(*args, **kwargs)
 
     """
     return _misc_.ArtProvider_GetIcon(*args, **kwargs)
 

+def ArtProvider_GetSizeHint(*args, **kwargs):
+    """
+    ArtProvider_GetSizeHint(String client, bool platform_dependent=False) -> Size
+
+    Get the size hint of an icon from a specific Art Client, queries the
+    topmost provider if platform_dependent = false
+    """
+    return _misc_.ArtProvider_GetSizeHint(*args, **kwargs)
+

 #---------------------------------------------------------------------------
 
 CONFIG_USE_LOCAL_FILE = _misc_.CONFIG_USE_LOCAL_FILE
 #---------------------------------------------------------------------------
 
 CONFIG_USE_LOCAL_FILE = _misc_.CONFIG_USE_LOCAL_FILE


@@ -3824,12 +3852,13 @@ class DateTime(object):
 
     def __repr__(self):
         if self.IsValid():
 
     def __repr__(self):
         if self.IsValid():

-            return '<wx.DateTime: \"%s\" at %s>' % ( self.Format(), self.this)
+            f = self.Format().encode(wx.GetDefaultPyEncoding())
+            return '<wx.DateTime: \"%s\" at %s>' % ( f, self.this)

         else:
             return '<wx.DateTime: \"INVALID\" at %s>' % self.this
     def __str__(self):
         if self.IsValid():
         else:
             return '<wx.DateTime: \"INVALID\" at %s>' % self.this
     def __str__(self):
         if self.IsValid():

-            return self.Format()
+            return self.Format().encode(wx.GetDefaultPyEncoding())

         else:
             return "INVALID DateTime"
 
         else:
             return "INVALID DateTime"
 


@@ -4149,9 +4178,10 @@ class TimeSpan(object):
         return _misc_.TimeSpan_Format(*args, **kwargs)
 
     def __repr__(self):
         return _misc_.TimeSpan_Format(*args, **kwargs)
 
     def __repr__(self):

-        return '<wx.TimeSpan: \"%s\" at %s>' % ( self.Format(), self.this)
+        f = self.Format().encode(wx.GetDefaultPyEncoding())
+        return '<wx.TimeSpan: \"%s\" at %s>' % ( f, self.this)

     def __str__(self):
     def __str__(self):

-        return self.Format()
+        return self.Format().encode(wx.GetDefaultPyEncoding())

 
 
 class TimeSpanPtr(TimeSpan):
 
 
 class TimeSpanPtr(TimeSpan):


@@ -5271,6 +5301,14 @@ class DropTarget(object):
         """GetData(self) -> bool"""
         return _misc_.DropTarget_GetData(*args, **kwargs)
 
         """GetData(self) -> bool"""
         return _misc_.DropTarget_GetData(*args, **kwargs)
 

+    def SetDefaultAction(*args, **kwargs):
+        """SetDefaultAction(self, int action)"""
+        return _misc_.DropTarget_SetDefaultAction(*args, **kwargs)
+
+    def GetDefaultAction(*args, **kwargs):
+        """GetDefaultAction(self) -> int"""
+        return _misc_.DropTarget_GetDefaultAction(*args, **kwargs)
+

 
 class DropTargetPtr(DropTarget):
     def __init__(self, this):
 
 class DropTargetPtr(DropTarget):
     def __init__(self, this):