SWIGged updates for wxGTK

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

diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py
index ec7a0ab9fde9f83c888f449d1bb7cffaf07b74bb..98ac3881dd7170236f36c97af897bde3e80f6629 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
@@ -672,11 +713,11 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetBackground(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetBackground,(self,) + _args, _kwargs)
-        if val: val = wxBrushPtr(val) 
+        if val: val = wxBrushPtr(val) ; val.thisown = 1
         return val
     def GetBrush(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetBrush,(self,) + _args, _kwargs)
-        if val: val = wxBrushPtr(val) 
+        if val: val = wxBrushPtr(val) ; val.thisown = 1
         return val
     def GetCharHeight(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetCharHeight,(self,) + _args, _kwargs)
@@ -689,7 +730,7 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetFont(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetFont,(self,) + _args, _kwargs)
-        if val: val = wxFontPtr(val) 
+        if val: val = wxFontPtr(val) ; val.thisown = 1
         return val
     def GetLogicalFunction(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs)
@@ -705,7 +746,7 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetPen(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetPen,(self,) + _args, _kwargs)
-        if val: val = wxPenPtr(val) 
+        if val: val = wxPenPtr(val) ; val.thisown = 1
         return val
     def GetPixel(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetPixel,(self,) + _args, _kwargs)
@@ -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
@@ -1242,6 +1286,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
@@ -1294,6 +1339,16 @@ wxFONTENCODING_UTF7 = gdic.wxFONTENCODING_UTF7
 wxFONTENCODING_UTF8 = gdic.wxFONTENCODING_UTF8
 wxFONTENCODING_UNICODE = gdic.wxFONTENCODING_UNICODE
 wxFONTENCODING_MAX = gdic.wxFONTENCODING_MAX
+wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
+wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
+wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED
+wxIMAGELIST_DRAW_FOCUSED = gdic.wxIMAGELIST_DRAW_FOCUSED
+wxIMAGE_LIST_NORMAL = gdic.wxIMAGE_LIST_NORMAL
+wxIMAGE_LIST_SMALL = gdic.wxIMAGE_LIST_SMALL
+wxIMAGE_LIST_STATE = gdic.wxIMAGE_LIST_STATE
+wxOutRegion = gdic.wxOutRegion
+wxPartRegion = gdic.wxPartRegion
+wxInRegion = gdic.wxInRegion
 cvar = gdic.cvar
 wxNORMAL_FONT = wxFontPtr(gdic.cvar.wxNORMAL_FONT)
 wxSMALL_FONT = wxFontPtr(gdic.cvar.wxSMALL_FONT)
@@ -1341,13 +1396,3 @@ wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList)
 wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList)
 wxTheBrushList = wxBrushListPtr(gdic.cvar.wxTheBrushList)
 wxTheColourDatabase = wxColourDatabasePtr(gdic.cvar.wxTheColourDatabase)
-wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL
-wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT
-wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED
-wxIMAGELIST_DRAW_FOCUSED = gdic.wxIMAGELIST_DRAW_FOCUSED
-wxIMAGE_LIST_NORMAL = gdic.wxIMAGE_LIST_NORMAL
-wxIMAGE_LIST_SMALL = gdic.wxIMAGE_LIST_SMALL
-wxIMAGE_LIST_STATE = gdic.wxIMAGE_LIST_STATE
-wxOutRegion = gdic.wxOutRegion
-wxPartRegion = gdic.wxPartRegion
-wxInRegion = gdic.wxInRegion