corrections to dynamic loading for Darwin

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

diff --git a/wxPython/src/msw/gdi.py b/wxPython/src/msw/gdi.py
index 6387dff88c993df51ddb81998c116d6b8f9af7dd..2b4388988aeccb33e1cd9149207ebee08835f8e5 100644 (file)
--- a/wxPython/src/msw/gdi.py
+++ b/wxPython/src/msw/gdi.py
@@ -244,6 +244,118 @@ class wxCursor(wxCursorPtr):
 
 
 
 
 
 

+class wxNativeFontInfoPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def Init(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_Init,(self,) + _args, _kwargs)
+        return val
+    def GetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetPointSize,(self,) + _args, _kwargs)
+        return val
+    def GetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetStyle,(self,) + _args, _kwargs)
+        return val
+    def GetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetWeight,(self,) + _args, _kwargs)
+        return val
+    def GetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetUnderlined,(self,) + _args, _kwargs)
+        return val
+    def GetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetFaceName,(self,) + _args, _kwargs)
+        return val
+    def GetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetFamily,(self,) + _args, _kwargs)
+        return val
+    def GetEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_GetEncoding,(self,) + _args, _kwargs)
+        return val
+    def SetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetPointSize,(self,) + _args, _kwargs)
+        return val
+    def SetStyle(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetStyle,(self,) + _args, _kwargs)
+        return val
+    def SetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetWeight,(self,) + _args, _kwargs)
+        return val
+    def SetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetUnderlined,(self,) + _args, _kwargs)
+        return val
+    def SetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetFaceName,(self,) + _args, _kwargs)
+        return val
+    def SetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetFamily,(self,) + _args, _kwargs)
+        return val
+    def SetEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_SetEncoding,(self,) + _args, _kwargs)
+        return val
+    def FromString(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_FromString,(self,) + _args, _kwargs)
+        return val
+    def ToString(self, *_args, **_kwargs):
+        val = apply(gdic.wxNativeFontInfo_ToString,(self,) + _args, _kwargs)
+        return val
+    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,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxNativeFontInfo,_args,_kwargs)
+        self.thisown = 1
+
+
+
+
+class wxFontMapperPtr :
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,gdic=gdic):
+        if self.thisown == 1 :
+            gdic.delete_wxFontMapper(self)
+    def GetAltForEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontMapper_GetAltForEncoding,(self,) + _args, _kwargs)
+        return val
+    def IsEncodingAvailable(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontMapper_IsEncodingAvailable,(self,) + _args, _kwargs)
+        return val
+    def CharsetToEncoding(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontMapper_CharsetToEncoding,(self,) + _args, _kwargs)
+        return val
+    def SetDialogParent(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontMapper_SetDialogParent,(self,) + _args, _kwargs)
+        return val
+    def SetDialogTitle(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontMapper_SetDialogTitle,(self,) + _args, _kwargs)
+        return val
+    def SetConfig(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontMapper_SetConfig,(self,) + _args, _kwargs)
+        return val
+    def SetConfigPath(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontMapper_SetConfigPath,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxFontMapper instance at %s>" % (self.this,)
+class wxFontMapper(wxFontMapperPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxFontMapper,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxFontPtr(wxGDIObjectPtr):
     def __init__(self,this):
         self.this = this
 class wxFontPtr(wxGDIObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -254,51 +366,67 @@ class wxFontPtr(wxGDIObjectPtr):
     def Ok(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_Ok,(self,) + _args, _kwargs)
         return val
     def Ok(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_Ok,(self,) + _args, _kwargs)
         return val

-    def GetFaceName(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetFaceName,(self,) + _args, _kwargs)
+    def GetPointSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetPointSize,(self,) + _args, _kwargs)

         return val
     def GetFamily(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetFamily,(self,) + _args, _kwargs)
         return val
         return val
     def GetFamily(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetFamily,(self,) + _args, _kwargs)
         return val

-    def GetFontId(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetFontId,(self,) + _args, _kwargs)
-        return val
-    def GetPointSize(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetPointSize,(self,) + _args, _kwargs)
-        return val

     def GetStyle(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetStyle,(self,) + _args, _kwargs)
         return val
     def GetStyle(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetStyle,(self,) + _args, _kwargs)
         return val

+    def GetWeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetWeight,(self,) + _args, _kwargs)
+        return val

     def GetUnderlined(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetUnderlined,(self,) + _args, _kwargs)
         return val
     def GetUnderlined(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetUnderlined,(self,) + _args, _kwargs)
         return val

-    def GetWeight(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_GetWeight,(self,) + _args, _kwargs)
+    def GetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_GetFaceName,(self,) + _args, _kwargs)

         return val
     def GetEncoding(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
         return val
         return val
     def GetEncoding(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetEncoding,(self,) + _args, _kwargs)
         return val

-    def SetFaceName(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetFaceName,(self,) + _args, _kwargs)
+    def IsFixedWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_IsFixedWidth,(self,) + _args, _kwargs)

         return val
         return val

-    def SetFamily(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetFamily,(self,) + _args, _kwargs)
+    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
         return val
     def SetPointSize(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetPointSize,(self,) + _args, _kwargs)
         return val

+    def SetFamily(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetFamily,(self,) + _args, _kwargs)
+        return val

     def SetStyle(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetStyle,(self,) + _args, _kwargs)
         return val
     def SetStyle(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetStyle,(self,) + _args, _kwargs)
         return val

-    def SetUnderlined(self, *_args, **_kwargs):
-        val = apply(gdic.wxFont_SetUnderlined,(self,) + _args, _kwargs)
-        return val

     def SetWeight(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetWeight,(self,) + _args, _kwargs)
         return val
     def SetWeight(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetWeight,(self,) + _args, _kwargs)
         return val

+    def SetFaceName(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetFaceName,(self,) + _args, _kwargs)
+        return val
+    def SetUnderlined(self, *_args, **_kwargs):
+        val = apply(gdic.wxFont_SetUnderlined,(self,) + _args, _kwargs)
+        return val

     def SetEncoding(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetEncoding,(self,) + _args, _kwargs)
         return val
     def SetEncoding(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_SetEncoding,(self,) + _args, _kwargs)
         return val

+    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
     def GetFamilyString(self, *_args, **_kwargs):
         val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs)
         return val


@@ -317,6 +445,11 @@ class wxFont(wxFontPtr):
 
 
 
 
 
 

+def wxFontFromNativeInfo(*_args,**_kwargs):
+    val = wxFontPtr(apply(gdic.new_wxFontFromNativeInfo,_args,_kwargs))
+    val.thisown = 1
+    return val
+

 
 class wxFontListPtr(wxObjectPtr):
     def __init__(self,this):
 
 class wxFontListPtr(wxObjectPtr):
     def __init__(self,this):


@@ -332,6 +465,9 @@ class wxFontListPtr(wxObjectPtr):
     def RemoveFont(self, *_args, **_kwargs):
         val = apply(gdic.wxFontList_RemoveFont,(self,) + _args, _kwargs)
         return val
     def RemoveFont(self, *_args, **_kwargs):
         val = apply(gdic.wxFontList_RemoveFont,(self,) + _args, _kwargs)
         return val

+    def GetCount(self, *_args, **_kwargs):
+        val = apply(gdic.wxFontList_GetCount,(self,) + _args, _kwargs)
+        return val

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


@@ -414,7 +550,7 @@ class wxPenPtr(wxGDIObjectPtr):
         return val
     def GetColour(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_GetColour,(self,) + _args, _kwargs)
         return val
     def GetColour(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_GetColour,(self,) + _args, _kwargs)

-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
     def GetJoin(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_GetJoin,(self,) + _args, _kwargs)
         return val
     def GetJoin(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_GetJoin,(self,) + _args, _kwargs)


@@ -443,9 +579,6 @@ class wxPenPtr(wxGDIObjectPtr):
     def SetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs)
         return val
     def SetWidth(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetWidth,(self,) + _args, _kwargs)
         return val

-    def GetDashes(self, *_args, **_kwargs):
-        val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs)
-        return val

     def SetDashes(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)
         return val
     def SetDashes(self, *_args, **_kwargs):
         val = apply(gdic.wxPen_SetDashes,(self,) + _args, _kwargs)
         return val


@@ -466,6 +599,26 @@ class wxPen(wxPenPtr):
 
 
 
 
 
 

+class wxPyPenPtr(wxPenPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,gdic=gdic):
+        if self.thisown == 1 :
+            gdic.delete_wxPyPen(self)
+    def SetDashes(self, *_args, **_kwargs):
+        val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxPyPen instance at %s>" % (self.this,)
+class wxPyPen(wxPyPenPtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxPyPen,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxPenListPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this
 class wxPenListPtr(wxObjectPtr):
     def __init__(self,this):
         self.this = this


@@ -480,6 +633,9 @@ class wxPenListPtr(wxObjectPtr):
     def RemovePen(self, *_args, **_kwargs):
         val = apply(gdic.wxPenList_RemovePen,(self,) + _args, _kwargs)
         return val
     def RemovePen(self, *_args, **_kwargs):
         val = apply(gdic.wxPenList_RemovePen,(self,) + _args, _kwargs)
         return val

+    def GetCount(self, *_args, **_kwargs):
+        val = apply(gdic.wxPenList_GetCount,(self,) + _args, _kwargs)
+        return val

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


@@ -498,7 +654,7 @@ class wxBrushPtr(wxGDIObjectPtr):
             gdic.delete_wxBrush(self)
     def GetColour(self, *_args, **_kwargs):
         val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)
             gdic.delete_wxBrush(self)
     def GetColour(self, *_args, **_kwargs):
         val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)

-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
     def GetStipple(self, *_args, **_kwargs):
         val = apply(gdic.wxBrush_GetStipple,(self,) + _args, _kwargs)
         return val
     def GetStipple(self, *_args, **_kwargs):
         val = apply(gdic.wxBrush_GetStipple,(self,) + _args, _kwargs)


@@ -529,7 +685,7 @@ class wxBrush(wxBrushPtr):
 
 
 
 
 
 

-class wxBrushListPtr :
+class wxBrushListPtr(wxObjectPtr):

     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def __init__(self,this):
         self.this = this
         self.thisown = 0


@@ -543,6 +699,9 @@ class wxBrushListPtr :
     def RemoveBrush(self, *_args, **_kwargs):
         val = apply(gdic.wxBrushList_RemoveBrush,(self,) + _args, _kwargs)
         return val
     def RemoveBrush(self, *_args, **_kwargs):
         val = apply(gdic.wxBrushList_RemoveBrush,(self,) + _args, _kwargs)
         return val

+    def GetCount(self, *_args, **_kwargs):
+        val = apply(gdic.wxBrushList_GetCount,(self,) + _args, _kwargs)
+        return val

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


@@ -601,6 +760,13 @@ class wxDCPtr(wxObjectPtr):
     def DrawIcon(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawIcon,(self,) + _args, _kwargs)
         return val
     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
     def DrawLine(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_DrawLine,(self,) + _args, _kwargs)
         return val


@@ -642,11 +808,11 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetBackground(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetBackground,(self,) + _args, _kwargs)
         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)
         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)
         return val
     def GetCharHeight(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetCharHeight,(self,) + _args, _kwargs)


@@ -659,7 +825,7 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetFont(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetFont,(self,) + _args, _kwargs)
         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)
         return val
     def GetLogicalFunction(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetLogicalFunction,(self,) + _args, _kwargs)


@@ -675,7 +841,7 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetPen(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetPen,(self,) + _args, _kwargs)
         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)
         return val
     def GetPixel(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetPixel,(self,) + _args, _kwargs)


@@ -694,7 +860,7 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetTextBackground(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs)
         return val
     def GetTextBackground(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetTextBackground,(self,) + _args, _kwargs)

-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
     def GetTextExtent(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetTextExtent,(self,) + _args, _kwargs)
         return val
     def GetTextExtent(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetTextExtent,(self,) + _args, _kwargs)


@@ -704,7 +870,7 @@ class wxDCPtr(wxObjectPtr):
         return val
     def GetTextForeground(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs)
         return val
     def GetTextForeground(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetTextForeground,(self,) + _args, _kwargs)

-        if val: val = wxColourPtr(val) 
+        if val: val = wxColourPtr(val) ; val.thisown = 1

         return val
     def GetUserScale(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetUserScale,(self,) + _args, _kwargs)
         return val
     def GetUserScale(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_GetUserScale,(self,) + _args, _kwargs)


@@ -748,6 +914,9 @@ class wxDCPtr(wxObjectPtr):
     def SetClippingRegion(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_SetClippingRegion,(self,) + _args, _kwargs)
         return val
     def SetClippingRegion(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_SetClippingRegion,(self,) + _args, _kwargs)
         return val

+    def SetClippingRegionAsRegion(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_SetClippingRegionAsRegion,(self,) + _args, _kwargs)
+        return val

     def SetPalette(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_SetPalette,(self,) + _args, _kwargs)
         return val
     def SetPalette(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_SetPalette,(self,) + _args, _kwargs)
         return val


@@ -821,8 +990,39 @@ class wxDCPtr(wxObjectPtr):
     def ResetBoundingBox(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_ResetBoundingBox,(self,) + _args, _kwargs)
         return val
     def ResetBoundingBox(self, *_args, **_kwargs):
         val = apply(gdic.wxDC_ResetBoundingBox,(self,) + _args, _kwargs)
         return val

+    def GetBoundingBox(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetBoundingBox,(self,) + _args, _kwargs)
+        return val
+    def GetHDC(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC_GetHDC,(self,) + _args, _kwargs)
+        return val
+    def _DrawPointList(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC__DrawPointList,(self,) + _args, _kwargs)
+        return val
+    def _DrawLineList(self, *_args, **_kwargs):
+        val = apply(gdic.wxDC__DrawLineList,(self,) + _args, _kwargs)
+        return val

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

+    
+    def DrawPointList(self, points, pens=None):
+        if pens is None:
+           pens = []
+        elif isinstance(pens, wxPenPtr):
+           pens = [pens]
+        elif len(pens) != len(points):
+           raise ValueError('points and pens must have same length')
+        return self._DrawPointList(points, pens)
+
+    def DrawLineList(self, lines, pens=None):
+        if pens is None:
+           pens = []
+        elif isinstance(pens, wxPenPtr):
+           pens = [pens]
+        elif len(pens) != len(lines):
+           raise ValueError('lines and pens must have same length')
+        return self._DrawLineList(lines, pens)
+

 class wxDC(wxDCPtr):
     def __init__(self,this):
         self.this = this
 class wxDC(wxDCPtr):
     def __init__(self,this):
         self.this = this


@@ -912,12 +1112,49 @@ class wxWindowDC(wxWindowDCPtr):
 
 
 
 
 
 

+class wxMetaFilePtr(wxObjectPtr):
+    def __init__(self,this):
+        self.this = this
+        self.thisown = 0
+    def __del__(self,gdic=gdic):
+        if self.thisown == 1 :
+            gdic.delete_wxMetaFile(self)
+    def Ok(self, *_args, **_kwargs):
+        val = apply(gdic.wxMetaFile_Ok,(self,) + _args, _kwargs)
+        return val
+    def SetClipboard(self, *_args, **_kwargs):
+        val = apply(gdic.wxMetaFile_SetClipboard,(self,) + _args, _kwargs)
+        return val
+    def GetSize(self, *_args, **_kwargs):
+        val = apply(gdic.wxMetaFile_GetSize,(self,) + _args, _kwargs)
+        if val: val = wxSizePtr(val) ; val.thisown = 1
+        return val
+    def GetWidth(self, *_args, **_kwargs):
+        val = apply(gdic.wxMetaFile_GetWidth,(self,) + _args, _kwargs)
+        return val
+    def GetHeight(self, *_args, **_kwargs):
+        val = apply(gdic.wxMetaFile_GetHeight,(self,) + _args, _kwargs)
+        return val
+    def GetFileName(self, *_args, **_kwargs):
+        val = apply(gdic.wxMetaFile_GetFileName,(self,) + _args, _kwargs)
+        return val
+    def __repr__(self):
+        return "<C wxMetaFile instance at %s>" % (self.this,)
+class wxMetaFile(wxMetaFilePtr):
+    def __init__(self,*_args,**_kwargs):
+        self.this = apply(gdic.new_wxMetaFile,_args,_kwargs)
+        self.thisown = 1
+
+
+
+

 class wxMetaFileDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def Close(self, *_args, **_kwargs):
         val = apply(gdic.wxMetaFileDC_Close,(self,) + _args, _kwargs)
 class wxMetaFileDCPtr(wxDCPtr):
     def __init__(self,this):
         self.this = this
         self.thisown = 0
     def Close(self, *_args, **_kwargs):
         val = apply(gdic.wxMetaFileDC_Close,(self,) + _args, _kwargs)

+        if val: val = wxMetaFilePtr(val) 

         return val
     def __repr__(self):
         return "<C wxMetaFileDC instance at %s>" % (self.this,)
         return val
     def __repr__(self):
         return "<C wxMetaFileDC instance at %s>" % (self.this,)


@@ -1009,6 +1246,9 @@ class wxRegionPtr(wxGDIObjectPtr):
     def Clear(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
         return val
     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
     def Contains(self, *_args, **_kwargs):
         val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs)
         return val


@@ -1141,8 +1381,8 @@ def wxBitmapFromIcon(*_args, **_kwargs):
     if val: val = wxBitmapPtr(val); val.thisown = 1
     return val
 
     if val: val = wxBitmapPtr(val); val.thisown = 1
     return val
 

-def wxBitmapFromData(*_args, **_kwargs):
-    val = apply(gdic.wxBitmapFromData,_args,_kwargs)
+def wxBitmapFromBits(*_args, **_kwargs):
+    val = apply(gdic.wxBitmapFromBits,_args,_kwargs)

     if val: val = wxBitmapPtr(val); val.thisown = 1
     return val
 
     if val: val = wxBitmapPtr(val); val.thisown = 1
     return val
 


@@ -1166,10 +1406,6 @@ def wxStockCursor(*_args, **_kwargs):
     if val: val = wxCursorPtr(val); val.thisown = 1
     return val
 
     if val: val = wxCursorPtr(val); val.thisown = 1
     return val
 

-wxFont_GetDefaultEncoding = gdic.wxFont_GetDefaultEncoding
-
-wxFont_SetDefaultEncoding = gdic.wxFont_SetDefaultEncoding
-

 def wxNamedColour(*_args, **_kwargs):
     val = apply(gdic.wxNamedColour,_args,_kwargs)
     if val: val = wxColourPtr(val); val.thisown = 1
 def wxNamedColour(*_args, **_kwargs):
     val = apply(gdic.wxNamedColour,_args,_kwargs)
     if val: val = wxColourPtr(val); val.thisown = 1


@@ -1180,10 +1416,37 @@ def wxMemoryDCFromDC(*_args, **_kwargs):
     if val: val = wxMemoryDCPtr(val); val.thisown = 1
     return val
 
     if val: val = wxMemoryDCPtr(val); val.thisown = 1
     return val
 

+wxFontMapper_GetEncodingName = gdic.wxFontMapper_GetEncodingName
+
+wxFontMapper_GetEncodingDescription = gdic.wxFontMapper_GetEncodingDescription
+
+wxFontMapper_GetDefaultConfigPath = gdic.wxFontMapper_GetDefaultConfigPath
+
+wxFont_GetDefaultEncoding = gdic.wxFont_GetDefaultEncoding
+
+wxFont_SetDefaultEncoding = gdic.wxFont_SetDefaultEncoding
+

 
 
 #-------------- VARIABLE WRAPPERS ------------------
 
 
 
 #-------------- VARIABLE WRAPPERS ------------------
 

+wxFONTFAMILY_DEFAULT = gdic.wxFONTFAMILY_DEFAULT
+wxFONTFAMILY_DECORATIVE = gdic.wxFONTFAMILY_DECORATIVE
+wxFONTFAMILY_ROMAN = gdic.wxFONTFAMILY_ROMAN
+wxFONTFAMILY_SCRIPT = gdic.wxFONTFAMILY_SCRIPT
+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
+wxFONTSTYLE_MAX = gdic.wxFONTSTYLE_MAX
+wxFONTWEIGHT_NORMAL = gdic.wxFONTWEIGHT_NORMAL
+wxFONTWEIGHT_LIGHT = gdic.wxFONTWEIGHT_LIGHT
+wxFONTWEIGHT_BOLD = gdic.wxFONTWEIGHT_BOLD
+wxFONTWEIGHT_MAX = gdic.wxFONTWEIGHT_MAX

 wxFONTENCODING_SYSTEM = gdic.wxFONTENCODING_SYSTEM
 wxFONTENCODING_DEFAULT = gdic.wxFONTENCODING_DEFAULT
 wxFONTENCODING_ISO8859_1 = gdic.wxFONTENCODING_ISO8859_1
 wxFONTENCODING_SYSTEM = gdic.wxFONTENCODING_SYSTEM
 wxFONTENCODING_DEFAULT = gdic.wxFONTENCODING_DEFAULT
 wxFONTENCODING_ISO8859_1 = gdic.wxFONTENCODING_ISO8859_1


@@ -1201,6 +1464,7 @@ wxFONTENCODING_ISO8859_12 = gdic.wxFONTENCODING_ISO8859_12
 wxFONTENCODING_ISO8859_13 = gdic.wxFONTENCODING_ISO8859_13
 wxFONTENCODING_ISO8859_14 = gdic.wxFONTENCODING_ISO8859_14
 wxFONTENCODING_ISO8859_15 = gdic.wxFONTENCODING_ISO8859_15
 wxFONTENCODING_ISO8859_13 = gdic.wxFONTENCODING_ISO8859_13
 wxFONTENCODING_ISO8859_14 = gdic.wxFONTENCODING_ISO8859_14
 wxFONTENCODING_ISO8859_15 = gdic.wxFONTENCODING_ISO8859_15

+wxFONTENCODING_ISO8859_MAX = gdic.wxFONTENCODING_ISO8859_MAX

 wxFONTENCODING_KOI8 = gdic.wxFONTENCODING_KOI8
 wxFONTENCODING_ALTERNATIVE = gdic.wxFONTENCODING_ALTERNATIVE
 wxFONTENCODING_BULGARIAN = gdic.wxFONTENCODING_BULGARIAN
 wxFONTENCODING_KOI8 = gdic.wxFONTENCODING_KOI8
 wxFONTENCODING_ALTERNATIVE = gdic.wxFONTENCODING_ALTERNATIVE
 wxFONTENCODING_BULGARIAN = gdic.wxFONTENCODING_BULGARIAN


@@ -1209,10 +1473,34 @@ wxFONTENCODING_CP850 = gdic.wxFONTENCODING_CP850
 wxFONTENCODING_CP852 = gdic.wxFONTENCODING_CP852
 wxFONTENCODING_CP855 = gdic.wxFONTENCODING_CP855
 wxFONTENCODING_CP866 = gdic.wxFONTENCODING_CP866
 wxFONTENCODING_CP852 = gdic.wxFONTENCODING_CP852
 wxFONTENCODING_CP855 = gdic.wxFONTENCODING_CP855
 wxFONTENCODING_CP866 = gdic.wxFONTENCODING_CP866

+wxFONTENCODING_CP874 = gdic.wxFONTENCODING_CP874
+wxFONTENCODING_CP932 = gdic.wxFONTENCODING_CP932
+wxFONTENCODING_CP936 = gdic.wxFONTENCODING_CP936
+wxFONTENCODING_CP949 = gdic.wxFONTENCODING_CP949
+wxFONTENCODING_CP950 = gdic.wxFONTENCODING_CP950

 wxFONTENCODING_CP1250 = gdic.wxFONTENCODING_CP1250
 wxFONTENCODING_CP1251 = gdic.wxFONTENCODING_CP1251
 wxFONTENCODING_CP1252 = gdic.wxFONTENCODING_CP1252
 wxFONTENCODING_CP1250 = gdic.wxFONTENCODING_CP1250
 wxFONTENCODING_CP1251 = gdic.wxFONTENCODING_CP1251
 wxFONTENCODING_CP1252 = gdic.wxFONTENCODING_CP1252

+wxFONTENCODING_CP1253 = gdic.wxFONTENCODING_CP1253
+wxFONTENCODING_CP1254 = gdic.wxFONTENCODING_CP1254
+wxFONTENCODING_CP1255 = gdic.wxFONTENCODING_CP1255
+wxFONTENCODING_CP1256 = gdic.wxFONTENCODING_CP1256
+wxFONTENCODING_CP1257 = gdic.wxFONTENCODING_CP1257
+wxFONTENCODING_CP12_MAX = gdic.wxFONTENCODING_CP12_MAX
+wxFONTENCODING_UTF7 = gdic.wxFONTENCODING_UTF7
+wxFONTENCODING_UTF8 = gdic.wxFONTENCODING_UTF8
+wxFONTENCODING_UNICODE = gdic.wxFONTENCODING_UNICODE

 wxFONTENCODING_MAX = gdic.wxFONTENCODING_MAX
 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)
 cvar = gdic.cvar
 wxNORMAL_FONT = wxFontPtr(gdic.cvar.wxNORMAL_FONT)
 wxSMALL_FONT = wxFontPtr(gdic.cvar.wxSMALL_FONT)


@@ -1258,14 +1546,5 @@ wxNullFont = wxFontPtr(gdic.cvar.wxNullFont)
 wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)
 wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList)
 wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList)
 wxNullColour = wxColourPtr(gdic.cvar.wxNullColour)
 wxTheFontList = wxFontListPtr(gdic.cvar.wxTheFontList)
 wxThePenList = wxPenListPtr(gdic.cvar.wxThePenList)

+wxTheBrushList = wxBrushListPtr(gdic.cvar.wxTheBrushList)

 wxTheColourDatabase = wxColourDatabasePtr(gdic.cvar.wxTheColourDatabase)
 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