wxPython Merge #2 of 2.4 branch --> HEAD (branch tag: wxPy_2_4_merge_2)

[wxWidgets.git] / wxPython / src / fonts.i

diff --git a/wxPython/src/fonts.i b/wxPython/src/fonts.i
index 6e708d91caa6896128eb46373a66a5cae752a5db..8137e23db8eae78a22527038232e557861a72bf3 100644 (file)
--- a/wxPython/src/fonts.i
+++ b/wxPython/src/fonts.i
@@ -374,6 +374,7 @@ public:
     static wxFontEncoding GetDefaultEncoding();
     static void SetDefaultEncoding(wxFontEncoding encoding);
 
     static wxFontEncoding GetDefaultEncoding();
     static void SetDefaultEncoding(wxFontEncoding encoding);
 

+    %pragma(python) addtoclass = "def __nonzero__(self): return self.Ok()"

 };
 
 
 };
 
 


@@ -739,9 +740,9 @@ public:
     %pragma(python) addtoclass = "
     def Init(self, *_args, **_kwargs):
         if type(_args[0]) in [type(''), type(u'')]:
     %pragma(python) addtoclass = "
     def Init(self, *_args, **_kwargs):
         if type(_args[0]) in [type(''), type(u'')]:

-            val = apply(self.Init1, _args, _kwargs)
+            val = self.Init1(*_args, **_kwargs)

         else:
         else:

-            val = apply(self.Init2, _args, _kwargs)
+            val = self.Init2(*_args, **_kwargs)

         return val
     "
 
         return val
     "
 


@@ -969,6 +970,7 @@ public:
     // equivalent encodings, regardless the platform, including itself.
     static wxFontEncodingArray GetAllEquivalents(wxFontEncoding enc);
 
     // equivalent encodings, regardless the platform, including itself.
     static wxFontEncodingArray GetAllEquivalents(wxFontEncoding enc);
 

+    %pragma(python) addtoclass = "def __nonzero__(self): return self.IsOk()"

 };
 
 
 };