Use SetMinSize instead of SetSizeHints

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

diff --git a/wxPython/src/mac/_gdi.py b/wxPython/src/mac/_gdi.py
index 74f854c8c81581c3d2088f0dcb23b9287ebc6afb..2fc41643744ad77a16269aa4cac91c42ad72daf5 100644 (file)
--- a/wxPython/src/mac/_gdi.py
+++ b/wxPython/src/mac/_gdi.py
@@ -246,7 +246,7 @@ class Palette(GDIObject):
         return _gdi_.Palette_GetPixel(*args, **kwargs)
 
     def GetRGB(*args, **kwargs):
-        """GetRGB(int pixel) -> (R,G,B)"""
+        """GetRGB(self, int pixel) -> (R,G,B)"""
         return _gdi_.Palette_GetRGB(*args, **kwargs)
 
     def Ok(*args, **kwargs):
@@ -435,6 +435,14 @@ class Brush(GDIObject):
         """
         return _gdi_.Brush_GetStipple(*args, **kwargs)
 
+    def IsHatch(*args, **kwargs):
+        """
+        IsHatch(self) -> bool
+
+        Is the current style a hatch type?
+        """
+        return _gdi_.Brush_IsHatch(*args, **kwargs)
+
     def Ok(*args, **kwargs):
         """
         Ok(self) -> bool
@@ -593,6 +601,10 @@ class Bitmap(GDIObject):
         """
         return _gdi_.Bitmap_LoadFile(*args, **kwargs)
 
+    def GetPalette(*args, **kwargs):
+        """GetPalette(self) -> Palette"""
+        return _gdi_.Bitmap_GetPalette(*args, **kwargs)
+
     def CopyFromIcon(*args, **kwargs):
         """CopyFromIcon(self, Icon icon) -> bool"""
         return _gdi_.Bitmap_CopyFromIcon(*args, **kwargs)
@@ -1011,6 +1023,10 @@ class Region(GDIObject):
         """Clear(self)"""
         return _gdi_.Region_Clear(*args, **kwargs)
 
+    def Offset(*args, **kwargs):
+        """Offset(self, int x, int y) -> bool"""
+        return _gdi_.Region_Offset(*args, **kwargs)
+
     def Contains(*args, **kwargs):
         """Contains(self, int x, int y) -> int"""
         return _gdi_.Region_Contains(*args, **kwargs)
@@ -1628,6 +1644,14 @@ class Font(GDIObject):
         """GetPointSize(self) -> int"""
         return _gdi_.Font_GetPointSize(*args, **kwargs)
 
+    def GetPixelSize(*args, **kwargs):
+        """GetPixelSize(self) -> Size"""
+        return _gdi_.Font_GetPixelSize(*args, **kwargs)
+
+    def IsUsingSizeInPixels(*args, **kwargs):
+        """IsUsingSizeInPixels(self) -> bool"""
+        return _gdi_.Font_IsUsingSizeInPixels(*args, **kwargs)
+
     def GetFamily(*args, **kwargs):
         """GetFamily(self) -> int"""
         return _gdi_.Font_GetFamily(*args, **kwargs)
@@ -1672,6 +1696,10 @@ class Font(GDIObject):
         """SetPointSize(self, int pointSize)"""
         return _gdi_.Font_SetPointSize(*args, **kwargs)
 
+    def SetPixelSize(*args, **kwargs):
+        """SetPixelSize(self, Size pixelSize)"""
+        return _gdi_.Font_SetPixelSize(*args, **kwargs)
+
     def SetFamily(*args, **kwargs):
         """SetFamily(self, int family)"""
         return _gdi_.Font_SetFamily(*args, **kwargs)
@@ -1770,6 +1798,17 @@ def Font2(*args, **kwargs):
     val.thisown = 1
     return val
 
+def FontFromPixelSize(*args, **kwargs):
+    """
+    FontFromPixelSize(Size pixelSize, int family, int style, int weight, 
+        bool underlined=False, String face=wxEmptyString, 
+        int encoding=FONTENCODING_DEFAULT) -> Font
+    """
+    if kwargs.has_key('faceName'): kwargs['face'] = kwargs['faceName'];del kwargs['faceName']
+    val = _gdi_.new_FontFromPixelSize(*args, **kwargs)
+    val.thisown = 1
+    return val
+
 def Font_GetDefaultEncoding(*args, **kwargs):
     """Font_GetDefaultEncoding() -> int"""
     return _gdi_.Font_GetDefaultEncoding(*args, **kwargs)
@@ -2316,8 +2355,8 @@ def EncodingConverter_CanConvert(*args, **kwargs):
 # to the default catalog path.
 if wx.Platform == "__WXMSW__":
     import os
-    localedir = os.path.join(os.path.split(__file__)[0], "locale")
-    Locale_AddCatalogLookupPathPrefix(localedir)
+    _localedir = os.path.join(os.path.split(__file__)[0], "locale")
+    Locale.AddCatalogLookupPathPrefix(_localedir)
     del os
 
 #----------------------------------------------------------------------------