SWIGged updates for wxMac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-03-04 05:50:52 +00:00
parent 89505f6a9c
commit bf2e21452d
23 changed files with 732 additions and 268 deletions

View File

@@ -11,7 +11,10 @@ class wxGDIObjectPtr(wxObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxGDIObject):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def GetVisible(self, *_args, **_kwargs):
val = apply(gdic.wxGDIObject_GetVisible,(self,) + _args, _kwargs)
return val
@@ -37,7 +40,10 @@ class wxBitmapPtr(wxGDIObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxBitmap):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def GetPalette(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_GetPalette,(self,) + _args, _kwargs)
if val: val = wxPalettePtr(val)
@@ -121,7 +127,10 @@ class wxIconPtr(wxGDIObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxIcon):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def Ok(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs)
return val
@@ -162,7 +171,10 @@ class wxIconBundlePtr :
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxIconBundle):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def AddIcon(self, *_args, **_kwargs):
val = apply(gdic.wxIconBundle_AddIcon,(self,) + _args, _kwargs)
return val
@@ -199,7 +211,10 @@ class wxCursorPtr(wxGDIObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxCursor):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def Ok(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs)
return val
@@ -218,7 +233,10 @@ class wxColourPtr(wxObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxColour):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def Red(self, *_args, **_kwargs):
val = apply(gdic.wxColour_Red,(self,) + _args, _kwargs)
return val
@@ -290,7 +308,10 @@ class wxPenPtr(wxGDIObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxPen):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def GetCap(self, *_args, **_kwargs):
val = apply(gdic.wxPen_GetCap,(self,) + _args, _kwargs)
return val
@@ -347,7 +368,10 @@ class wxPyPenPtr(wxPenPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxPyPen):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def SetDashes(self, *_args, **_kwargs):
val = apply(gdic.wxPyPen_SetDashes,(self,) + _args, _kwargs)
return val
@@ -393,7 +417,10 @@ class wxBrushPtr(wxGDIObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxBrush):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def GetColour(self, *_args, **_kwargs):
val = apply(gdic.wxBrush_GetColour,(self,) + _args, _kwargs)
if val: val = wxColourPtr(val) ; val.thisown = 1
@@ -459,7 +486,10 @@ class wxDCPtr(wxObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxDC):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def BeginDrawing(self, *_args, **_kwargs):
val = apply(gdic.wxDC_BeginDrawing,(self,) + _args, _kwargs)
return val
@@ -750,26 +780,115 @@ class wxDCPtr(wxObjectPtr):
def _DrawLineList(self, *_args, **_kwargs):
val = apply(gdic.wxDC__DrawLineList,(self,) + _args, _kwargs)
return val
def _DrawRectangleList(self, *_args, **_kwargs):
val = apply(gdic.wxDC__DrawRectangleList,(self,) + _args, _kwargs)
return val
def _DrawEllipseList(self, *_args, **_kwargs):
val = apply(gdic.wxDC__DrawEllipseList,(self,) + _args, _kwargs)
return val
def _DrawPolygonList(self, *_args, **_kwargs):
val = apply(gdic.wxDC__DrawPolygonList,(self,) + _args, _kwargs)
return val
def _DrawTextList(self, *_args, **_kwargs):
val = apply(gdic.wxDC__DrawTextList,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxDC instance at %s>" % (self.this,)
def DrawPointList(self, points, pens=None):
if pens is None:
pens = []
elif wx.wxPy_isinstance(pens, (wxPen, wxPenPtr)):
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)
return self._DrawPointList(points, pens, [])
def DrawLineList(self, lines, pens=None):
if pens is None:
pens = []
elif wx.wxPy_isinstance(pens, (wxPen, wxPenPtr)):
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)
return self._DrawLineList(lines, pens, [])
def DrawRectangleList(self, rectangles, pens=None, brushes=None):
if pens is None:
pens = []
elif isinstance(pens, wxPenPtr):
pens = [pens]
elif len(pens) != len(rectangles):
raise ValueError('rectangles and pens must have same length')
if brushes is None:
brushes = []
elif isinstance(brushes, wxBrushPtr):
brushes = [brushes]
elif len(brushes) != len(rectangles):
raise ValueError('rectangles and brushes must have same length')
return self._DrawRectangleList(rectangles, pens, brushes)
def DrawEllipseList(self, ellipses, pens=None, brushes=None):
if pens is None:
pens = []
elif isinstance(pens, wxPenPtr):
pens = [pens]
elif len(pens) != len(ellipses):
raise ValueError('ellipses and pens must have same length')
if brushes is None:
brushes = []
elif isinstance(brushes, wxBrushPtr):
brushes = [brushes]
elif len(brushes) != len(ellipses):
raise ValueError('ellipses and brushes must have same length')
return self._DrawEllipseList(ellipses, pens, brushes)
def DrawPolygonList(self, polygons, pens=None, brushes=None):
## Note: This does not currently support fill style or offset
## you can always use the non-List version if need be.
## I really would like to support fill-style, however,
## but wxODDEVEN_RULE does not appear to be defined at the Python level
## [It's in wx.py... --Robin]
if pens is None:
pens = []
elif isinstance(pens, wxPenPtr):
pens = [pens]
elif len(pens) != len(polygons):
raise ValueError('polygons and pens must have same length')
if brushes is None:
brushes = []
elif isinstance(brushes, wxBrushPtr):
brushes = [brushes]
elif len(brushes) != len(polygons):
raise ValueError('polygons and brushes must have same length')
return self._DrawPolygonList(polygons, pens, brushes)
def DrawTextList(self, textList, coords, foregrounds = None, backgrounds = None, fonts = None):
## NOTE: this does not currently support changing the font
## Make sure you set Background mode to wxSolid (DC.SetBackgroundMode)
## If you want backgounds to do anything.
if type(textList) == type(''):
textList = [textList]
elif len(textList) != len(coords):
raise ValueError('textlist and coords must have same length')
if foregrounds is None:
foregrounds = []
elif isinstance(foregrounds, wxColourPtr):
foregrounds = [foregrounds]
elif len(foregrounds) != len(coords):
raise ValueError('foregrounds and coords must have same length')
if backgrounds is None:
backgrounds = []
elif isinstance(backgrounds, wxColourPtr):
backgrounds = [backgrounds]
elif len(backgrounds) != len(coords):
raise ValueError('backgrounds and coords must have same length')
return self._DrawTextList(textList, coords, foregrounds, backgrounds)
class wxDC(wxDCPtr):
def __init__(self,this):
@@ -904,7 +1023,10 @@ class wxPalettePtr(wxGDIObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxPalette):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def GetPixel(self, *_args, **_kwargs):
val = apply(gdic.wxPalette_GetPixel,(self,) + _args, _kwargs)
return val
@@ -930,7 +1052,10 @@ class wxImageListPtr(wxObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxImageList):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def Add(self, *_args, **_kwargs):
val = apply(gdic.wxImageList_Add,(self,) + _args, _kwargs)
return val
@@ -974,7 +1099,10 @@ class wxRegionPtr(wxGDIObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxRegion):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def Clear(self, *_args, **_kwargs):
val = apply(gdic.wxRegion_Clear,(self,) + _args, _kwargs)
return val
@@ -1049,7 +1177,10 @@ class wxRegionIteratorPtr(wxObjectPtr):
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxRegionIterator):
if self.thisown == 1:
delfunc(self)
try:
delfunc(self)
except:
pass
def GetX(self, *_args, **_kwargs):
val = apply(gdic.wxRegionIterator_GetX,(self,) + _args, _kwargs)
return val