X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/059a841c9651ba15b1ecc7a8c35189a813a122eb..4bb081fd23dc73d1bc005f67649c9eb0d244dc14:/wxPython/src/gtk/gdi.py diff --git a/wxPython/src/gtk/gdi.py b/wxPython/src/gtk/gdi.py index 04dc027853..89851fe3a4 100644 --- a/wxPython/src/gtk/gdi.py +++ b/wxPython/src/gtk/gdi.py @@ -2,6 +2,8 @@ import gdic from misc import * + +from fonts import * class wxGDIObjectPtr(wxObjectPtr): def __init__(self,this): self.this = this @@ -77,6 +79,9 @@ class wxBitmapPtr(wxGDIObjectPtr): 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,) @@ -164,185 +169,56 @@ class wxIcon(wxIconPtr): -class wxCursorPtr(wxGDIObjectPtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def __del__(self,gdic=gdic): - if self.thisown == 1 : - gdic.delete_wxCursor(self) - def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs) - return val - def __repr__(self): - return "" % (self.this,) -class wxCursor(wxCursorPtr): - def __init__(self,this): - self.this = this - - - - -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 : +class wxIconBundlePtr : 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) + gdic.delete_wxIconBundle(self) + def AddIcon(self, *_args, **_kwargs): + val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs) return val - def SetConfig(self, *_args, **_kwargs): - val = apply(gdic.wxFontMapper_SetConfig,(self,) + _args, _kwargs) + def AddIconFromFile(self, *_args, **_kwargs): + val = apply(gdic.wxIconBundle_AddIconFromFile,(self,) + _args, _kwargs) return val - def SetConfigPath(self, *_args, **_kwargs): - val = apply(gdic.wxFontMapper_SetConfigPath,(self,) + _args, _kwargs) + def GetIcon(self, *_args, **_kwargs): + val = apply(gdic.wxIconBundle_GetIcon,(self,) + _args, _kwargs) + if val: val = wxIconPtr(val) return val def __repr__(self): - return "" % (self.this,) -class wxFontMapper(wxFontMapperPtr): + return "" % (self.this,) +class wxIconBundle(wxIconBundlePtr): def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxFontMapper,_args,_kwargs) + self.this = apply(gdic.new_wxIconBundle,_args,_kwargs) self.thisown = 1 +def wxIconBundleFromFile(*_args,**_kwargs): + val = wxIconBundlePtr(apply(gdic.new_wxIconBundleFromFile,_args,_kwargs)) + val.thisown = 1 + return val -class wxFontPtr(wxGDIObjectPtr): - def __init__(self,this): - self.this = this - self.thisown = 0 - def __del__(self,gdic=gdic): - if self.thisown == 1 : - gdic.delete_wxFont(self) - def Ok(self, *_args, **_kwargs): - val = apply(gdic.wxFont_Ok,(self,) + _args, _kwargs) - return val - 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 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 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 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 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 - def GetStyleString(self, *_args, **_kwargs): - val = apply(gdic.wxFont_GetStyleString,(self,) + _args, _kwargs) - return val - def GetWeightString(self, *_args, **_kwargs): - val = apply(gdic.wxFont_GetWeightString,(self,) + _args, _kwargs) - return val - def __repr__(self): - return "" % (self.this,) -class wxFont(wxFontPtr): - def __init__(self,*_args,**_kwargs): - self.this = apply(gdic.new_wxFont,_args,_kwargs) - self.thisown = 1 - - - -def wxFontFromNativeInfo(*_args,**_kwargs): - val = wxFontPtr(apply(gdic.new_wxFontFromNativeInfo,_args,_kwargs)) +def wxIconBundleFromIcon(*_args,**_kwargs): + val = wxIconBundlePtr(apply(gdic.new_wxIconBundleFromIcon,_args,_kwargs)) val.thisown = 1 return val -class wxFontListPtr(wxObjectPtr): +class wxCursorPtr(wxGDIObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 - def AddFont(self, *_args, **_kwargs): - val = apply(gdic.wxFontList_AddFont,(self,) + _args, _kwargs) - return val - def FindOrCreateFont(self, *_args, **_kwargs): - val = apply(gdic.wxFontList_FindOrCreateFont,(self,) + _args, _kwargs) - if val: val = wxFontPtr(val) - return val - def RemoveFont(self, *_args, **_kwargs): - val = apply(gdic.wxFontList_RemoveFont,(self,) + _args, _kwargs) + def __del__(self,gdic=gdic): + if self.thisown == 1 : + gdic.delete_wxCursor(self) + def Ok(self, *_args, **_kwargs): + val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs) return val def __repr__(self): - return "" % (self.this,) -class wxFontList(wxFontListPtr): + return "" % (self.this,) +class wxCursor(wxCursorPtr): def __init__(self,this): self.this = this @@ -451,12 +327,12 @@ class wxPenPtr(wxGDIObjectPtr): 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 GetDashes(self, *_args, **_kwargs): + val = apply(gdic.wxPen_GetDashes,(self,) + _args, _kwargs) + return val def __repr__(self): return "" % (self.this,) class wxPen(wxPenPtr): @@ -467,6 +343,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 "" % (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 @@ -481,6 +377,9 @@ class wxPenListPtr(wxObjectPtr): 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): @@ -530,7 +429,7 @@ class wxBrush(wxBrushPtr): -class wxBrushListPtr : +class wxBrushListPtr(wxObjectPtr): def __init__(self,this): self.this = this self.thisown = 0 @@ -544,6 +443,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): @@ -602,6 +504,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 @@ -643,11 +552,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) @@ -660,7 +569,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) @@ -676,7 +585,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) @@ -825,8 +734,36 @@ class wxDCPtr(wxObjectPtr): 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 @@ -851,6 +788,44 @@ class wxMemoryDC(wxMemoryDCPtr): +class wxBufferedDCPtr(wxMemoryDCPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def UnMask(self, *_args, **_kwargs): + val = apply(gdic.wxBufferedDC_UnMask,(self,) + _args, _kwargs) + return val + def __repr__(self): + return "" % (self.this,) +class wxBufferedDC(wxBufferedDCPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(gdic.new_wxBufferedDC,_args,_kwargs) + self.thisown = 1 + self._dc = _args[0] # save a ref so the other dc won't be deleted before self + + + +def wxBufferedDCInternalBuffer(*_args,**_kwargs): + val = wxBufferedDCPtr(apply(gdic.new_wxBufferedDCInternalBuffer,_args,_kwargs)) + val.thisown = 1 + val._dc = _args[0] # save a ref so the other dc won't be deleted before self + return val + + +class wxBufferedPaintDCPtr(wxBufferedDCPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" % (self.this,) +class wxBufferedPaintDC(wxBufferedPaintDCPtr): + def __init__(self,*_args,**_kwargs): + self.this = apply(gdic.new_wxBufferedPaintDC,_args,_kwargs) + self.thisown = 1 + + + + class wxScreenDCPtr(wxDCPtr): def __init__(self,this): self.this = this @@ -916,20 +891,6 @@ 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(wxGDIObjectPtr): def __init__(self,this): self.this = this @@ -1010,6 +971,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 @@ -1162,6 +1126,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 @@ -1177,76 +1146,20 @@ 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 -wxFONTENCODING_ISO8859_2 = gdic.wxFONTENCODING_ISO8859_2 -wxFONTENCODING_ISO8859_3 = gdic.wxFONTENCODING_ISO8859_3 -wxFONTENCODING_ISO8859_4 = gdic.wxFONTENCODING_ISO8859_4 -wxFONTENCODING_ISO8859_5 = gdic.wxFONTENCODING_ISO8859_5 -wxFONTENCODING_ISO8859_6 = gdic.wxFONTENCODING_ISO8859_6 -wxFONTENCODING_ISO8859_7 = gdic.wxFONTENCODING_ISO8859_7 -wxFONTENCODING_ISO8859_8 = gdic.wxFONTENCODING_ISO8859_8 -wxFONTENCODING_ISO8859_9 = gdic.wxFONTENCODING_ISO8859_9 -wxFONTENCODING_ISO8859_10 = gdic.wxFONTENCODING_ISO8859_10 -wxFONTENCODING_ISO8859_11 = gdic.wxFONTENCODING_ISO8859_11 -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 -wxFONTENCODING_CP437 = gdic.wxFONTENCODING_CP437 -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_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) @@ -1292,14 +1205,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 -wxOutRegion = gdic.wxOutRegion -wxPartRegion = gdic.wxPartRegion -wxInRegion = gdic.wxInRegion