X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbfc9df6768069f770bf8299fc0e6f528a92d4a8..a7c987f91eeb8c97c58da966686bd2d5d0087ea8:/wxPython/src/gtk/_gdi.py

diff --git a/wxPython/src/gtk/_gdi.py b/wxPython/src/gtk/_gdi.py
index 532073c7fb..c2ea1d45da 100644
--- a/wxPython/src/gtk/_gdi.py
+++ b/wxPython/src/gtk/_gdi.py
@@ -1230,19 +1230,73 @@ class IconBundle(object):
         _gdi_.IconBundle_swiginit(self,_gdi_.new_IconBundle(*args, **kwargs))
     __swig_destroy__ = _gdi_.delete_IconBundle
     __del__ = lambda self : None;
+    def IsOk(*args, **kwargs):
+        """IsOk(self) -> bool"""
+        return _gdi_.IconBundle_IsOk(*args, **kwargs)
+
+    def __nonzero__(self): return self.IsOk() 
     def AddIcon(*args, **kwargs):
-        """AddIcon(self, Icon icon)"""
+        """
+        AddIcon(self, Icon icon)
+
+        Adds the icon to the collection, if the collection already contains an
+        icon with the same width and height, it is replaced
+        """
         return _gdi_.IconBundle_AddIcon(*args, **kwargs)
 
     def AddIconFromFile(*args, **kwargs):
-        """AddIconFromFile(self, String file, long type)"""
+        """
+        AddIconFromFile(self, String file, long type)
+
+        Adds all the icons contained in the file to the collection, if the
+        collection already contains icons with the same width and height, they
+        are replaced
+        """
         return _gdi_.IconBundle_AddIconFromFile(*args, **kwargs)
 
     def GetIcon(*args, **kwargs):
-        """GetIcon(self, Size size) -> Icon"""
+        """
+        GetIcon(self, Size size) -> Icon
+
+        Returns the icon with the given size; if no such icon exists, returns
+        the icon with size wxSYS_ICON_[XY]; if no such icon exists, returns
+        the first icon in the bundle
+        """
         return _gdi_.IconBundle_GetIcon(*args, **kwargs)
 
-    Icon = property(GetIcon,doc="See `GetIcon`") 
+    def GetIconOfExactSize(*args, **kwargs):
+        """
+        GetIconOfExactSize(self, Size size) -> Icon
+
+        Returns the icon exactly of the specified size or wxNullIcon if no
+        icon of exactly given size are available.
+        """
+        return _gdi_.IconBundle_GetIconOfExactSize(*args, **kwargs)
+
+    def GetIconCount(*args, **kwargs):
+        """
+        GetIconCount(self) -> size_t
+
+        return the number of available icons
+        """
+        return _gdi_.IconBundle_GetIconCount(*args, **kwargs)
+
+    def GetIconByIndex(*args, **kwargs):
+        """
+        GetIconByIndex(self, size_t n) -> Icon
+
+        Return the icon at index (must be < GetIconCount())
+        """
+        return _gdi_.IconBundle_GetIconByIndex(*args, **kwargs)
+
+    def IsEmpty(*args, **kwargs):
+        """
+        IsEmpty(self) -> bool
+
+        Check if we have any icons at all
+        """
+        return _gdi_.IconBundle_IsEmpty(*args, **kwargs)
+
 _gdi_.IconBundle_swigregister(IconBundle)
 
 def IconBundleFromFile(*args, **kwargs):
@@ -2634,9 +2688,8 @@ class Locale(object):
     __del__ = lambda self : None;
     def Init1(*args, **kwargs):
         """
-        Init1(self, String szName, String szShort=EmptyString, String szLocale=EmptyString, 
-            bool bLoadDefault=True, 
-            bool bConvertEncoding=False) -> bool
+        Init1(self, String name, String shortName=EmptyString, String locale=EmptyString, 
+            bool bLoadDefault=True, bool bConvertEncoding=False) -> bool
         """
         return _gdi_.Locale_Init1(*args, **kwargs)
 
@@ -2693,7 +2746,7 @@ class Locale(object):
 
     AddCatalogLookupPathPrefix = staticmethod(AddCatalogLookupPathPrefix)
     def AddCatalog(*args, **kwargs):
-        """AddCatalog(self, String szDomain) -> bool"""
+        """AddCatalog(self, String domain) -> bool"""
         return _gdi_.Locale_AddCatalog(*args, **kwargs)
 
     def IsAvailable(*args, **kwargs):
@@ -2702,7 +2755,7 @@ class Locale(object):
 
     IsAvailable = staticmethod(IsAvailable)
     def IsLoaded(*args, **kwargs):
-        """IsLoaded(self, String szDomain) -> bool"""
+        """IsLoaded(self, String domain) -> bool"""
         return _gdi_.Locale_IsLoaded(*args, **kwargs)
 
     def GetLanguageInfo(*args, **kwargs):
@@ -2726,7 +2779,7 @@ class Locale(object):
 
     AddLanguage = staticmethod(AddLanguage)
     def GetString(*args, **kwargs):
-        """GetString(self, String szOrigString, String szDomain=EmptyString) -> String"""
+        """GetString(self, String origString, String domain=EmptyString) -> String"""
         return _gdi_.Locale_GetString(*args, **kwargs)
 
     def GetName(*args, **kwargs):
@@ -2793,14 +2846,11 @@ class PyLocale(Locale):
         return _gdi_.PyLocale__setCallbackInfo(*args, **kwargs)
 
     def GetSingularString(*args, **kwargs):
-        """GetSingularString(self, wxChar szOrigString, wxChar szDomain=None) -> wxChar"""
+        """GetSingularString(self, String origString, String domain=EmptyString) -> String"""
         return _gdi_.PyLocale_GetSingularString(*args, **kwargs)
 
     def GetPluralString(*args, **kwargs):
-        """
-        GetPluralString(self, wxChar szOrigString, wxChar szOrigString2, size_t n, 
-            wxChar szDomain=None) -> wxChar
-        """
+        """GetPluralString(self, String origString, String origString2, size_t n, String domain=EmptyString) -> String"""
         return _gdi_.PyLocale_GetPluralString(*args, **kwargs)
 
 _gdi_.PyLocale_swigregister(PyLocale)
@@ -4979,6 +5029,13 @@ class PrinterDC(DC):
         _gdi_.PrinterDC_swiginit(self,_gdi_.new_PrinterDC(*args, **kwargs))
 _gdi_.PrinterDC_swigregister(PrinterDC)
 
+class SVGFileDC(DC):
+    """Proxy of C++ SVGFileDC class"""
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc='The membership flag')
+    def __init__(self): raise AttributeError, "No constructor defined"
+    __repr__ = _swig_repr
+_gdi_.SVGFileDC_swigregister(SVGFileDC)
+
 #---------------------------------------------------------------------------
 
 class GraphicsObject(_core.Object):
@@ -6262,6 +6319,7 @@ NullBrush = cvar.NullBrush
 NullPalette = cvar.NullPalette
 NullFont = cvar.NullFont
 NullColour = cvar.NullColour
+NullIconBundle = cvar.NullIconBundle
 
 class PenList(GDIObjListBase):
     """Proxy of C++ PenList class"""
@@ -6435,6 +6493,7 @@ CONTROL_ISDEFAULT = _gdi_.CONTROL_ISDEFAULT
 CONTROL_ISSUBMENU = _gdi_.CONTROL_ISSUBMENU
 CONTROL_EXPANDED = _gdi_.CONTROL_EXPANDED
 CONTROL_SIZEGRIP = _gdi_.CONTROL_SIZEGRIP
+CONTROL_FLAT = _gdi_.CONTROL_FLAT
 CONTROL_CURRENT = _gdi_.CONTROL_CURRENT
 CONTROL_SELECTED = _gdi_.CONTROL_SELECTED
 CONTROL_CHECKED = _gdi_.CONTROL_CHECKED