X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbcadfca9c05a38f2aaf0a3f6090f4afcb666819..8dba8632c5bcd64724e2e9e2d40e295555a0cb86:/wxPython/src/gtk/gdi.py?ds=inline diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 64dd60933b..292e3e7a57 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -2,7 +2,33 @@ import gdic from misc import * -class wxBitmapPtr : +class wxGDIObjectPtr(wxObjectPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self,gdic=gdic): + if self.thisown == 1 : + gdic.delete_wxGDIObject(self) + def GetVisible(self, *_args, **_kwargs): + val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs) + return val + def SetVisible(self, *_args, **_kwargs): + val = apply(gdic.wxGDIObject_SetVisible,(self,) + _args, _kwargs) + return val + def IsNull(self, *_args, **_kwargs): + val = apply(gdic.wxGDIObject_IsNull,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxGDIObject(wxGDIObjectPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(gdic.new_wxGDIObject,_args,_kwargs) + self.thisown = 1 + + + + +class wxBitmapPtr(wxGDIObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -51,6 +77,9 @@ class wxBitmapPtr : val = apply(gdic.wxBitmap_GetSubBitmap,(self,) + _args, _kwargs) if val: val = wxBitmapPtr(val) ; val.thisown = 1 return val + def CopyFromIcon(self, *_args, **_kwargs): + val = apply(gdic.wxBitmap_CopyFromIcon,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) @@ -69,7 +98,7 @@ class wxBitmap(wxBitmapPtr): -class wxMaskPtr : +class wxMaskPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -86,7 +115,7 @@ class wxMask(wxMaskPtr): -class wxIconPtr : +class wxIconPtr(wxGDIObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -138,7 +167,7 @@ class wxIcon(wxIconPtr): -class wxCursorPtr : +class wxCursorPtr(wxGDIObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -157,7 +186,67 @@ class wxCursor(wxCursorPtr): -class wxFontPtr : +class wxNativeFontInfoPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + 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 __repr__(self): + return "" % (self.this,) +class wxNativeFontInfo(wxNativeFontInfoPtr): + def __init__(self,this): + self.this = this + + + + +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 "" % (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 self.thisown = 0 @@ -167,48 +256,55 @@ class wxFontPtr : 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 - 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 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 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 - def SetFaceName(self, *_args, **_kwargs): - val = apply(gdic.wxFont_SetFaceName,(self,) + _args, _kwargs) - 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 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 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 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 SetNativeFontInfo(self, *_args, **_kwargs): + val = apply(gdic.wxFont_SetNativeFontInfo,(self,) + _args, _kwargs) + return val def GetFamilyString(self, *_args, **_kwargs): val = apply(gdic.wxFont_GetFamilyString,(self,) + _args, _kwargs) return val @@ -227,8 +323,13 @@ class wxFont(wxFontPtr): +def wxFontFromNativeInfo(*_args,**_kwargs): + val = wxFontPtr(apply(gdic.new_wxFontFromNativeInfo,_args,_kwargs)) + val.thisown = 1 + return val + -class wxFontListPtr : +class wxFontListPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -242,6 +343,9 @@ class wxFontListPtr : 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 "" % (self.this,) class wxFontList(wxFontListPtr): @@ -251,7 +355,7 @@ class wxFontList(wxFontListPtr): -class wxColourPtr : +class wxColourPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -289,7 +393,7 @@ class wxColour(wxColourPtr): -class wxColourDatabasePtr : +class wxColourDatabasePtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -312,7 +416,7 @@ class wxColourDatabase(wxColourDatabasePtr): -class wxPenPtr : +class wxPenPtr(wxGDIObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -324,7 +428,7 @@ class wxPenPtr : 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) @@ -353,9 +457,6 @@ class wxPenPtr : 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 @@ -369,7 +470,27 @@ class wxPen(wxPenPtr): -class wxPenListPtr : +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 "" % (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 self.thisown = 0 @@ -383,6 +504,9 @@ class wxPenListPtr : 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 "" % (self.this,) class wxPenList(wxPenListPtr): @@ -392,7 +516,7 @@ class wxPenList(wxPenListPtr): -class wxBrushPtr : +class wxBrushPtr(wxGDIObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -401,7 +525,7 @@ class wxBrushPtr : 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) @@ -432,7 +556,7 @@ class wxBrush(wxBrushPtr): -class wxBrushListPtr : +class wxBrushListPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -446,6 +570,9 @@ class wxBrushListPtr : 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 "" % (self.this,) class wxBrushList(wxBrushListPtr): @@ -455,7 +582,7 @@ class wxBrushList(wxBrushListPtr): -class wxDCPtr : +class wxDCPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -545,11 +672,11 @@ class wxDCPtr : 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) @@ -562,7 +689,7 @@ class wxDCPtr : 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) @@ -578,7 +705,7 @@ class wxDCPtr : 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) @@ -597,7 +724,7 @@ class wxDCPtr : 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) @@ -607,7 +734,7 @@ class wxDCPtr : 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) @@ -651,6 +778,9 @@ class wxDCPtr : 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 @@ -724,8 +854,36 @@ class wxDCPtr : 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 _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 "" % (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 @@ -815,21 +973,7 @@ class wxWindowDC(wxWindowDCPtr): -class wxPostScriptDCPtr(wxDCPtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def __repr__(self): - return "" % (self.this,) -class wxPostScriptDC(wxPostScriptDCPtr): - def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxPostScriptDC,_args,_kwargs) - self.thisown = 1 - - - - -class wxPalettePtr : +class wxPalettePtr(wxGDIObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -855,7 +999,7 @@ class wxPalette(wxPalettePtr): -class wxImageListPtr : +class wxImageListPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -899,6 +1043,129 @@ class wxImageList(wxImageListPtr): +class wxRegionPtr(wxGDIObjectPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self,gdic=gdic): + if self.thisown == 1 : + gdic.delete_wxRegion(self) + def Clear(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs) + return val + def Contains(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_Contains,(self,) + _args, _kwargs) + return val + def ContainsPoint(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_ContainsPoint,(self,) + _args, _kwargs) + return val + def ContainsRect(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_ContainsRect,(self,) + _args, _kwargs) + return val + def ContainsRectDim(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_ContainsRectDim,(self,) + _args, _kwargs) + return val + def GetBox(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_GetBox,(self,) + _args, _kwargs) + if val: val = wxRectPtr(val) ; val.thisown = 1 + return val + def Intersect(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_Intersect,(self,) + _args, _kwargs) + return val + def IntersectRect(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_IntersectRect,(self,) + _args, _kwargs) + return val + def IntersectRegion(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_IntersectRegion,(self,) + _args, _kwargs) + return val + def IsEmpty(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_IsEmpty,(self,) + _args, _kwargs) + return val + def Union(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_Union,(self,) + _args, _kwargs) + return val + def UnionRect(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_UnionRect,(self,) + _args, _kwargs) + return val + def UnionRegion(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_UnionRegion,(self,) + _args, _kwargs) + return val + def Subtract(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_Subtract,(self,) + _args, _kwargs) + return val + def SubtractRect(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_SubtractRect,(self,) + _args, _kwargs) + return val + def SubtractRegion(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_SubtractRegion,(self,) + _args, _kwargs) + return val + def Xor(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_Xor,(self,) + _args, _kwargs) + return val + def XorRect(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_XorRect,(self,) + _args, _kwargs) + return val + def XorRegion(self, *_args, **_kwargs): + val = apply(gdic.wxRegion_XorRegion,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxRegion(wxRegionPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(gdic.new_wxRegion,_args,_kwargs) + self.thisown = 1 + + + + +class wxRegionIteratorPtr(wxObjectPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self,gdic=gdic): + if self.thisown == 1 : + gdic.delete_wxRegionIterator(self) + def GetX(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs) + return val + def GetY(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_GetY,(self,) + _args, _kwargs) + return val + def GetW(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_GetW,(self,) + _args, _kwargs) + return val + def GetWidth(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_GetWidth,(self,) + _args, _kwargs) + return val + def GetH(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_GetH,(self,) + _args, _kwargs) + return val + def GetHeight(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_GetHeight,(self,) + _args, _kwargs) + return val + def GetRect(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_GetRect,(self,) + _args, _kwargs) + if val: val = wxRectPtr(val) ; val.thisown = 1 + return val + def HaveRects(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_HaveRects,(self,) + _args, _kwargs) + return val + def Reset(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_Reset,(self,) + _args, _kwargs) + return val + def Next(self, *_args, **_kwargs): + val = apply(gdic.wxRegionIterator_Next,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxRegionIterator(wxRegionIteratorPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(gdic.new_wxRegionIterator,_args,_kwargs) + self.thisown = 1 + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -918,6 +1185,11 @@ def wxBitmapFromIcon(*_args, **_kwargs): if val: val = wxBitmapPtr(val); val.thisown = 1 return val +def wxBitmapFromBits(*_args, **_kwargs): + val = apply(gdic.wxBitmapFromBits,_args,_kwargs) + if val: val = wxBitmapPtr(val); val.thisown = 1 + return val + def wxMaskColour(*_args, **_kwargs): val = apply(gdic.wxMaskColour,_args,_kwargs) if val: val = wxMaskPtr(val); val.thisown = 1 @@ -938,10 +1210,6 @@ def wxStockCursor(*_args, **_kwargs): 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 @@ -952,10 +1220,36 @@ def wxMemoryDCFromDC(*_args, **_kwargs): 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 ------------------ +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 +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 @@ -973,6 +1267,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_MAX = gdic.wxFONTENCODING_ISO8859_MAX wxFONTENCODING_KOI8 = gdic.wxFONTENCODING_KOI8 wxFONTENCODING_ALTERNATIVE = gdic.wxFONTENCODING_ALTERNATIVE wxFONTENCODING_BULGARIAN = gdic.wxFONTENCODING_BULGARIAN @@ -981,10 +1276,34 @@ wxFONTENCODING_CP850 = gdic.wxFONTENCODING_CP850 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_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 +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) @@ -1030,11 +1349,5 @@ wxNullFont = wxFontPtr(gdic.cvar.wxNullFont) 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) -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