Calling a virtual function from a destructor is not good:

[wxWidgets.git] / wxPython / src / gtk / fonts.py

diff --git a/wxPython/src/gtk/fonts.py b/wxPython/src/gtk/fonts.py
index 71e013f9c6fe783442b9725270707f325cb99c15..4f2f474f91b984a17e37c587b52d32d5b146a08d 100644 (file)
--- a/wxPython/src/gtk/fonts.py
+++ b/wxPython/src/gtk/fonts.py
@@ -6,20 +6,50 @@ class wxNativeFontInfoPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def FromXFontName(self, *_args, **_kwargs):
-        val = apply(fontsc.wxNativeFontInfo_FromXFontName,(self,) + _args, _kwargs)
+    def Init(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_Init,(self,) + _args, _kwargs)

         return val
         return val

-    def IsDefault(self, *_args, **_kwargs):
-        val = apply(fontsc.wxNativeFontInfo_IsDefault,(self,) + _args, _kwargs)
+    def GetPointSize(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_GetPointSize,(self,) + _args, _kwargs)

         return val
         return val

-    def GetXFontName(self, *_args, **_kwargs):
-        val = apply(fontsc.wxNativeFontInfo_GetXFontName,(self,) + _args, _kwargs)
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_GetStyle,(self,) + _args, _kwargs)

         return val
         return val

-    def SetXFontName(self, *_args, **_kwargs):
-        val = apply(fontsc.wxNativeFontInfo_SetXFontName,(self,) + _args, _kwargs)
+    def GetWeight(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_GetWeight,(self,) + _args, _kwargs)

         return val
         return val

-    def Init(self, *_args, **_kwargs):
-        val = apply(fontsc.wxNativeFontInfo_Init,(self,) + _args, _kwargs)
+    def GetUnderlined(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_GetUnderlined,(self,) + _args, _kwargs)
+        return val
+    def GetFaceName(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_GetFaceName,(self,) + _args, _kwargs)
+        return val
+    def GetFamily(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_GetFamily,(self,) + _args, _kwargs)
+        return val
+    def GetEncoding(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_GetEncoding,(self,) + _args, _kwargs)
+        return val
+    def SetPointSize(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_SetPointSize,(self,) + _args, _kwargs)
+        return val
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_SetStyle,(self,) + _args, _kwargs)
+        return val
+    def SetWeight(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_SetWeight,(self,) + _args, _kwargs)
+        return val
+    def SetUnderlined(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_SetUnderlined,(self,) + _args, _kwargs)
+        return val
+    def SetFaceName(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_SetFaceName,(self,) + _args, _kwargs)
+        return val
+    def SetFamily(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_SetFamily,(self,) + _args, _kwargs)
+        return val
+    def SetEncoding(self, *_args, **_kwargs):
+        val = apply(fontsc.wxNativeFontInfo_SetEncoding,(self,) + _args, _kwargs)

         return val
     def FromString(self, *_args, **_kwargs):
         val = apply(fontsc.wxNativeFontInfo_FromString,(self,) + _args, _kwargs)
         return val
     def FromString(self, *_args, **_kwargs):
         val = apply(fontsc.wxNativeFontInfo_FromString,(self,) + _args, _kwargs)


@@ -50,9 +80,12 @@ class wxFontMapperPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,fontsc=fontsc):
-        if self.thisown == 1 :
-            fontsc.delete_wxFontMapper(self)
+    def __del__(self, delfunc=fontsc.delete_wxFontMapper):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def GetAltForEncoding(self, *_args, **_kwargs):
         val = apply(fontsc.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs)
         return val
     def GetAltForEncoding(self, *_args, **_kwargs):
         val = apply(fontsc.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs)
         return val


@@ -88,9 +121,16 @@ class wxFontPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,fontsc=fontsc):
-        if self.thisown == 1 :
-            fontsc.delete_wxFont(self)
+    def wxFontFromNativeInfoString(self, *_args, **_kwargs):
+        val = apply(fontsc.wxFont_wxFontFromNativeInfoString,(self,) + _args, _kwargs)
+        if val: val = wxFontPtr(val) ; val.thisown = 1
+        return val
+    def __del__(self, delfunc=fontsc.delete_wxFont):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def Ok(self, *_args, **_kwargs):
         val = apply(fontsc.wxFont_Ok,(self,) + _args, _kwargs)
         return val
     def Ok(self, *_args, **_kwargs):
         val = apply(fontsc.wxFont_Ok,(self,) + _args, _kwargs)
         return val


@@ -164,6 +204,12 @@ class wxFontPtr(wxObjectPtr):
     def GetWeightString(self, *_args, **_kwargs):
         val = apply(fontsc.wxFont_GetWeightString,(self,) + _args, _kwargs)
         return val
     def GetWeightString(self, *_args, **_kwargs):
         val = apply(fontsc.wxFont_GetWeightString,(self,) + _args, _kwargs)
         return val

+    def SetNoAntiAliasing(self, *_args, **_kwargs):
+        val = apply(fontsc.wxFont_SetNoAntiAliasing,(self,) + _args, _kwargs)
+        return val
+    def GetNoAntiAliasing(self, *_args, **_kwargs):
+        val = apply(fontsc.wxFont_GetNoAntiAliasing,(self,) + _args, _kwargs)
+        return val

     def __repr__(self):
         return "<C wxFont instance at %s>" % (self.this,)
 class wxFont(wxFontPtr):
     def __repr__(self):
         return "<C wxFont instance at %s>" % (self.this,)
 class wxFont(wxFontPtr):


@@ -209,9 +255,12 @@ class wxFontEnumeratorPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,fontsc=fontsc):
-        if self.thisown == 1 :
-            fontsc.delete_wxFontEnumerator(self)
+    def __del__(self, delfunc=fontsc.delete_wxFontEnumerator):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def _setCallbackInfo(self, *_args, **_kwargs):
         val = apply(fontsc.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs)
         return val
     def _setCallbackInfo(self, *_args, **_kwargs):
         val = apply(fontsc.wxFontEnumerator__setCallbackInfo,(self,) + _args, _kwargs)
         return val


@@ -274,12 +323,18 @@ class wxLocalePtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def Init(self, *_args, **_kwargs):
-        val = apply(fontsc.wxLocale_Init,(self,) + _args, _kwargs)
+    def __del__(self, delfunc=fontsc.delete_wxLocale):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass
+    def Init1(self, *_args, **_kwargs):
+        val = apply(fontsc.wxLocale_Init1,(self,) + _args, _kwargs)
+        return val
+    def Init2(self, *_args, **_kwargs):
+        val = apply(fontsc.wxLocale_Init2,(self,) + _args, _kwargs)

         return val
         return val

-    def __del__(self,fontsc=fontsc):
-        if self.thisown == 1 :
-            fontsc.delete_wxLocale(self)

     def IsOk(self, *_args, **_kwargs):
         val = apply(fontsc.wxLocale_IsOk,(self,) + _args, _kwargs)
         return val
     def IsOk(self, *_args, **_kwargs):
         val = apply(fontsc.wxLocale_IsOk,(self,) + _args, _kwargs)
         return val


@@ -309,6 +364,14 @@ class wxLocalePtr :
         return val
     def __repr__(self):
         return "<C wxLocale instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxLocale instance at %s>" % (self.this,)

+    
+    def Init(self, *_args, **_kwargs):
+        if type(_args[0]) in [type(''), type(u'')]:
+            val = apply(self.Init1, _args, _kwargs)
+        else:
+            val = apply(self.Init2, _args, _kwargs)
+        return val
+    

 class wxLocale(wxLocalePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(fontsc.new_wxLocale,_args,_kwargs)
 class wxLocale(wxLocalePtr):
     def __init__(self,*_args,**_kwargs):
         self.this = apply(fontsc.new_wxLocale,_args,_kwargs)


@@ -321,9 +384,12 @@ class wxEncodingConverterPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0

-    def __del__(self,fontsc=fontsc):
-        if self.thisown == 1 :
-            fontsc.delete_wxEncodingConverter(self)
+    def __del__(self, delfunc=fontsc.delete_wxEncodingConverter):
+        if self.thisown == 1:
+            try:
+                delfunc(self)
+            except:
+                pass

     def Init(self, *_args, **_kwargs):
         val = apply(fontsc.wxEncodingConverter_Init,(self,) + _args, _kwargs)
         return val
     def Init(self, *_args, **_kwargs):
         val = apply(fontsc.wxEncodingConverter_Init,(self,) + _args, _kwargs)
         return val


@@ -453,6 +519,10 @@ wxFONTENCODING_CP1257 = fontsc.wxFONTENCODING_CP1257
 wxFONTENCODING_CP12_MAX = fontsc.wxFONTENCODING_CP12_MAX
 wxFONTENCODING_UTF7 = fontsc.wxFONTENCODING_UTF7
 wxFONTENCODING_UTF8 = fontsc.wxFONTENCODING_UTF8
 wxFONTENCODING_CP12_MAX = fontsc.wxFONTENCODING_CP12_MAX
 wxFONTENCODING_UTF7 = fontsc.wxFONTENCODING_UTF7
 wxFONTENCODING_UTF8 = fontsc.wxFONTENCODING_UTF8

+wxFONTENCODING_GB2312 = fontsc.wxFONTENCODING_GB2312
+wxFONTENCODING_BIG5 = fontsc.wxFONTENCODING_BIG5
+wxFONTENCODING_SHIFT_JIS = fontsc.wxFONTENCODING_SHIFT_JIS
+wxFONTENCODING_EUC_JP = fontsc.wxFONTENCODING_EUC_JP

 wxFONTENCODING_UNICODE = fontsc.wxFONTENCODING_UNICODE
 wxFONTENCODING_MAX = fontsc.wxFONTENCODING_MAX
 wxLANGUAGE_DEFAULT = fontsc.wxLANGUAGE_DEFAULT
 wxFONTENCODING_UNICODE = fontsc.wxFONTENCODING_UNICODE
 wxFONTENCODING_MAX = fontsc.wxFONTENCODING_MAX
 wxLANGUAGE_DEFAULT = fontsc.wxLANGUAGE_DEFAULT