Fixed compilation error and a stupid typo

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

diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py
index 292e3e7a579dec7f21891938a04b0437446b1cf9..9fe67ce5538823eb27b31821d3725921aee8d02b 100644 (file)
--- a/wxPython/src/gtk/gdi.py
+++ b/wxPython/src/gtk/gdi.py
@@ -190,6 +190,21 @@ class wxNativeFontInfoPtr :
     def __init__(self,this):
         self.this = this
         self.thisown = 0
+    def FromXFontName(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_FromXFontName,(self,) + _args, _kwargs)
+        return val
+    def IsDefault(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_IsDefault,(self,) + _args, _kwargs)
+        return val
+    def GetXFontName(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetXFontName,(self,) + _args, _kwargs)
+        return val
+    def SetXFontName(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetXFontName,(self,) + _args, _kwargs)
+        return val
+    def Init(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_Init,(self,) + _args, _kwargs)
+        return val
     def FromString(self, *_args, **_kwargs):
         val = apply(gdic.wxNativeFontInfo_FromString,(self,) + _args, _kwargs)
         return val
@@ -199,11 +214,18 @@ class wxNativeFontInfoPtr :
     def __str__(self, *_args, **_kwargs):
         val = apply(gdic.wxNativeFontInfo___str__,(self,) + _args, _kwargs)
         return val
+    def FromUserString(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_FromUserString,(self,) + _args, _kwargs)
+        return val
+    def ToUserString(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_ToUserString,(self,) + _args, _kwargs)
+        return val
     def __repr__(self):
         return "<C wxNativeFontInfo instance at %s>" % (self.this,)
 class wxNativeFontInfo(wxNativeFontInfoPtr):
-    def __init__(self,this):
-        self.this = this
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxNativeFontInfo,_args,_kwargs)
+        self.thisown = 1
 
 
 
@@ -277,10 +299,19 @@ class wxFontPtr(wxGDIObjectPtr):
     def GetEncoding(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
         return val
+    def IsFixedWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_IsFixedWidth,(self,) + _args, _kwargs)
+        return val
     def GetNativeFontInfo(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetNativeFontInfo,(self,) + _args, _kwargs)
         if val: val = wxNativeFontInfoPtr(val) 
         return val
+    def GetNativeFontInfoDesc(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetNativeFontInfoDesc,(self,) + _args, _kwargs)
+        return val
+    def GetNativeFontInfoUserDesc(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetNativeFontInfoUserDesc,(self,) + _args, _kwargs)
+        return val
     def SetPointSize(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs)
         return val
@@ -305,6 +336,9 @@ class wxFontPtr(wxGDIObjectPtr):
     def SetNativeFontInfo(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetNativeFontInfo,(self,) + _args, _kwargs)
         return val
+    def SetNativeFontInfoUserDesc(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetNativeFontInfoUserDesc,(self,) + _args, _kwargs)
+        return val
     def GetFamilyString(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs)
         return val
@@ -631,6 +665,13 @@ class wxDCPtr(wxObjectPtr):
     def DrawIcon(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs)
         return val
+    def DrawLabel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawLabel,(self,) + _args, _kwargs)
+        return val
+    def DrawImageLabel(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_DrawImageLabel,(self,) + _args, _kwargs)
+        if val: val = wxRectPtr(val) ; val.thisown = 1
+        return val
     def DrawLine(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs)
         return val
@@ -1053,6 +1094,9 @@ class wxRegionPtr(wxGDIObjectPtr):
     def Clear(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
         return val
+    def Offset(self, *_args, **_kwargs):
+        val = apply(gdic.wxRegion_Offset,(self,) + _args, _kwargs)
+        return val
     def Contains(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs)
         return val
@@ -1205,6 +1249,11 @@ def wxIconFromXPMData(*_args, **_kwargs):
     if val: val = wxIconPtr(val); val.thisown = 1
     return val
 
+def wxIconFromBitmap(*_args, **_kwargs):
+    val = apply(gdic.wxIconFromBitmap,_args,_kwargs)
+    if val: val = wxIconPtr(val); val.thisown = 1
+    return val
+
 def wxStockCursor(*_args, **_kwargs):
     val = apply(gdic.wxStockCursor,_args,_kwargs)
     if val: val = wxCursorPtr(val); val.thisown = 1
@@ -1242,6 +1291,7 @@ wxFONTFAMILY_SWISS = gdic.wxFONTFAMILY_SWISS
 wxFONTFAMILY_MODERN = gdic.wxFONTFAMILY_MODERN
 wxFONTFAMILY_TELETYPE = gdic.wxFONTFAMILY_TELETYPE
 wxFONTFAMILY_MAX = gdic.wxFONTFAMILY_MAX
+wxFONTFAMILY_UNKNOWN = gdic.wxFONTFAMILY_UNKNOWN
 wxFONTSTYLE_NORMAL = gdic.wxFONTSTYLE_NORMAL
 wxFONTSTYLE_ITALIC = gdic.wxFONTSTYLE_ITALIC
 wxFONTSTYLE_SLANT = gdic.wxFONTSTYLE_SLANT