reSWIGged
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
parent
d2f9bbfd43
commit
eb9b610777
@ -1256,7 +1256,7 @@ static PyObject *_wrap_ShapeRegion_GetColour(PyObject *self, PyObject *args, PyO
|
||||
static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxShapeRegion *arg1 = (wxShapeRegion *) 0 ;
|
||||
wxColour *result;
|
||||
wxColour result;
|
||||
PyObject * obj0 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self", NULL
|
||||
@ -1266,12 +1266,16 @@ static PyObject *_wrap_ShapeRegion_GetActualColourObject(PyObject *self, PyObjec
|
||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxShapeRegion,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (wxColour *)(arg1)->GetActualColourObject();
|
||||
result = (arg1)->GetActualColourObject();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_wxColour, 0);
|
||||
{
|
||||
wxColour * resultptr;
|
||||
resultptr = new wxColour((wxColour &) result);
|
||||
resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxColour, 1);
|
||||
}
|
||||
return resultobj;
|
||||
fail:
|
||||
return NULL;
|
||||
|
||||
@ -1552,8 +1552,36 @@ def PreSpinCtrl(*args, **kwargs):
|
||||
val.thisown = 1
|
||||
return val
|
||||
|
||||
class SpinEvent(core.NotifyEvent):
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxSpinEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""__init__(wxEventType commandType=wxEVT_NULL, int winid=0) -> SpinEvent"""
|
||||
newobj = _controls.new_SpinEvent(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
del newobj.thisown
|
||||
def GetPosition(*args, **kwargs):
|
||||
"""GetPosition() -> int"""
|
||||
return _controls.SpinEvent_GetPosition(*args, **kwargs)
|
||||
|
||||
def SetPosition(*args, **kwargs):
|
||||
"""SetPosition(int pos)"""
|
||||
return _controls.SpinEvent_SetPosition(*args, **kwargs)
|
||||
|
||||
|
||||
class SpinEventPtr(SpinEvent):
|
||||
def __init__(self, this):
|
||||
self.this = this
|
||||
if not hasattr(self,"thisown"): self.thisown = 0
|
||||
self.__class__ = SpinEvent
|
||||
_controls.SpinEvent_swigregister(SpinEventPtr)
|
||||
|
||||
wxEVT_COMMAND_SPINCTRL_UPDATED = _controls.wxEVT_COMMAND_SPINCTRL_UPDATED
|
||||
EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
|
||||
EVT_SPIN_UP = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEUP, 1)
|
||||
EVT_SPIN_DOWN = wx.PyEventBinder( wx.wxEVT_SCROLL_LINEDOWN, 1)
|
||||
EVT_SPIN = wx.PyEventBinder( wx.wxEVT_SCROLL_THUMBTRACK, 1)
|
||||
EVT_SPINCTRL = wx.PyEventBinder( wxEVT_COMMAND_SPINCTRL_UPDATED, 1)
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -2939,10 +2939,6 @@ EVT_COMMAND_SCROLL_THUMBTRACK = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
|
||||
EVT_COMMAND_SCROLL_THUMBRELEASE = wx.PyEventBinder( wxEVT_SCROLL_THUMBRELEASE, 1)
|
||||
EVT_COMMAND_SCROLL_ENDSCROLL = wx.PyEventBinder( wxEVT_SCROLL_ENDSCROLL, 1)
|
||||
|
||||
EVT_SPIN_UP = wx.PyEventBinder( wxEVT_SCROLL_LINEUP, 1)
|
||||
EVT_SPIN_DOWN = wx.PyEventBinder( wxEVT_SCROLL_LINEDOWN, 1)
|
||||
EVT_SPIN = wx.PyEventBinder( wxEVT_SCROLL_THUMBTRACK, 1)
|
||||
|
||||
EVT_BUTTON = wx.PyEventBinder( wxEVT_COMMAND_BUTTON_CLICKED, 1)
|
||||
EVT_CHECKBOX = wx.PyEventBinder( wxEVT_COMMAND_CHECKBOX_CLICKED, 1)
|
||||
EVT_CHOICE = wx.PyEventBinder( wxEVT_COMMAND_CHOICE_SELECTED, 1)
|
||||
@ -4952,6 +4948,7 @@ class PyOnDemandOutputWindow:
|
||||
style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)
|
||||
self.text = wx.TextCtrl(self.frame, -1, "",
|
||||
style = wx.TE_MULTILINE | wx.TE_READONLY)
|
||||
self.text.AppendText(st)
|
||||
self.frame.SetSize((450, 300))
|
||||
self.frame.Show(True)
|
||||
EVT_CLOSE(self.frame, self.OnCloseWindow)
|
||||
|
||||
@ -611,7 +611,7 @@ class Icon(GDIObject):
|
||||
def __repr__(self):
|
||||
return "<%s.%s; proxy of C++ wxIcon instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""__init__(String name, long flags, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
|
||||
"""__init__(String name, int type, int desiredWidth=-1, int desiredHeight=-1) -> Icon"""
|
||||
newobj = _gdi.new_Icon(*args, **kwargs)
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
@ -623,7 +623,7 @@ class Icon(GDIObject):
|
||||
except: pass
|
||||
|
||||
def LoadFile(*args, **kwargs):
|
||||
"""LoadFile(String name, long flags) -> bool"""
|
||||
"""LoadFile(String name, int type) -> bool"""
|
||||
return _gdi.Icon_LoadFile(*args, **kwargs)
|
||||
|
||||
def GetHandle(*args, **kwargs):
|
||||
@ -2771,8 +2771,8 @@ class DC(core.Object):
|
||||
|
||||
|
||||
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.
|
||||
if pens is None:
|
||||
pens = []
|
||||
elif isinstance(pens, wx.Pen):
|
||||
@ -2789,9 +2789,9 @@ class DC(core.Object):
|
||||
|
||||
|
||||
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):
|
||||
@ -3139,6 +3139,246 @@ class PrinterDCPtr(PrinterDC):
|
||||
self.__class__ = PrinterDC
|
||||
_gdi.PrinterDC_swigregister(PrinterDCPtr)
|
||||
|
||||
class DC_old(DC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = DC.FloodFillXY
|
||||
GetPixel = DC.GetPixelXY
|
||||
DrawLine = DC.DrawLineXY
|
||||
CrossHair = DC.CrossHairXY
|
||||
DrawArc = DC.DrawArcXY
|
||||
DrawCheckMark = DC.DrawCheckMarkXY
|
||||
DrawEllipticArc = DC.DrawEllipticArcXY
|
||||
DrawPoint = DC.DrawPointXY
|
||||
DrawRectangle = DC.DrawRectangleXY
|
||||
DrawRoundedRectangle = DC.DrawRoundedRectangleXY
|
||||
DrawCircle = DC.DrawCircleXY
|
||||
DrawEllipse = DC.DrawEllipseXY
|
||||
DrawIcon = DC.DrawIconXY
|
||||
DrawBitmap = DC.DrawBitmapXY
|
||||
DrawText = DC.DrawTextXY
|
||||
DrawRotatedText = DC.DrawRotatedTextXY
|
||||
Blit = DC.BlitXY
|
||||
|
||||
class MemoryDC_old(MemoryDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = MemoryDC.FloodFillXY
|
||||
GetPixel = MemoryDC.GetPixelXY
|
||||
DrawLine = MemoryDC.DrawLineXY
|
||||
CrossHair = MemoryDC.CrossHairXY
|
||||
DrawArc = MemoryDC.DrawArcXY
|
||||
DrawCheckMark = MemoryDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = MemoryDC.DrawEllipticArcXY
|
||||
DrawPoint = MemoryDC.DrawPointXY
|
||||
DrawRectangle = MemoryDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = MemoryDC.DrawRoundedRectangleXY
|
||||
DrawCircle = MemoryDC.DrawCircleXY
|
||||
DrawEllipse = MemoryDC.DrawEllipseXY
|
||||
DrawIcon = MemoryDC.DrawIconXY
|
||||
DrawBitmap = MemoryDC.DrawBitmapXY
|
||||
DrawText = MemoryDC.DrawTextXY
|
||||
DrawRotatedText = MemoryDC.DrawRotatedTextXY
|
||||
Blit = MemoryDC.BlitXY
|
||||
|
||||
class BufferedDC_old(BufferedDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = BufferedDC.FloodFillXY
|
||||
GetPixel = BufferedDC.GetPixelXY
|
||||
DrawLine = BufferedDC.DrawLineXY
|
||||
CrossHair = BufferedDC.CrossHairXY
|
||||
DrawArc = BufferedDC.DrawArcXY
|
||||
DrawCheckMark = BufferedDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = BufferedDC.DrawEllipticArcXY
|
||||
DrawPoint = BufferedDC.DrawPointXY
|
||||
DrawRectangle = BufferedDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = BufferedDC.DrawRoundedRectangleXY
|
||||
DrawCircle = BufferedDC.DrawCircleXY
|
||||
DrawEllipse = BufferedDC.DrawEllipseXY
|
||||
DrawIcon = BufferedDC.DrawIconXY
|
||||
DrawBitmap = BufferedDC.DrawBitmapXY
|
||||
DrawText = BufferedDC.DrawTextXY
|
||||
DrawRotatedText = BufferedDC.DrawRotatedTextXY
|
||||
Blit = BufferedDC.BlitXY
|
||||
|
||||
class BufferedPaintDC_old(BufferedPaintDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = BufferedPaintDC.FloodFillXY
|
||||
GetPixel = BufferedPaintDC.GetPixelXY
|
||||
DrawLine = BufferedPaintDC.DrawLineXY
|
||||
CrossHair = BufferedPaintDC.CrossHairXY
|
||||
DrawArc = BufferedPaintDC.DrawArcXY
|
||||
DrawCheckMark = BufferedPaintDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = BufferedPaintDC.DrawEllipticArcXY
|
||||
DrawPoint = BufferedPaintDC.DrawPointXY
|
||||
DrawRectangle = BufferedPaintDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = BufferedPaintDC.DrawRoundedRectangleXY
|
||||
DrawCircle = BufferedPaintDC.DrawCircleXY
|
||||
DrawEllipse = BufferedPaintDC.DrawEllipseXY
|
||||
DrawIcon = BufferedPaintDC.DrawIconXY
|
||||
DrawBitmap = BufferedPaintDC.DrawBitmapXY
|
||||
DrawText = BufferedPaintDC.DrawTextXY
|
||||
DrawRotatedText = BufferedPaintDC.DrawRotatedTextXY
|
||||
Blit = BufferedPaintDC.BlitXY
|
||||
|
||||
class ScreenDC_old(ScreenDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = ScreenDC.FloodFillXY
|
||||
GetPixel = ScreenDC.GetPixelXY
|
||||
DrawLine = ScreenDC.DrawLineXY
|
||||
CrossHair = ScreenDC.CrossHairXY
|
||||
DrawArc = ScreenDC.DrawArcXY
|
||||
DrawCheckMark = ScreenDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = ScreenDC.DrawEllipticArcXY
|
||||
DrawPoint = ScreenDC.DrawPointXY
|
||||
DrawRectangle = ScreenDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = ScreenDC.DrawRoundedRectangleXY
|
||||
DrawCircle = ScreenDC.DrawCircleXY
|
||||
DrawEllipse = ScreenDC.DrawEllipseXY
|
||||
DrawIcon = ScreenDC.DrawIconXY
|
||||
DrawBitmap = ScreenDC.DrawBitmapXY
|
||||
DrawText = ScreenDC.DrawTextXY
|
||||
DrawRotatedText = ScreenDC.DrawRotatedTextXY
|
||||
Blit = ScreenDC.BlitXY
|
||||
|
||||
class ClientDC_old(ClientDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = ClientDC.FloodFillXY
|
||||
GetPixel = ClientDC.GetPixelXY
|
||||
DrawLine = ClientDC.DrawLineXY
|
||||
CrossHair = ClientDC.CrossHairXY
|
||||
DrawArc = ClientDC.DrawArcXY
|
||||
DrawCheckMark = ClientDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = ClientDC.DrawEllipticArcXY
|
||||
DrawPoint = ClientDC.DrawPointXY
|
||||
DrawRectangle = ClientDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = ClientDC.DrawRoundedRectangleXY
|
||||
DrawCircle = ClientDC.DrawCircleXY
|
||||
DrawEllipse = ClientDC.DrawEllipseXY
|
||||
DrawIcon = ClientDC.DrawIconXY
|
||||
DrawBitmap = ClientDC.DrawBitmapXY
|
||||
DrawText = ClientDC.DrawTextXY
|
||||
DrawRotatedText = ClientDC.DrawRotatedTextXY
|
||||
Blit = ClientDC.BlitXY
|
||||
|
||||
class PaintDC_old(PaintDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = PaintDC.FloodFillXY
|
||||
GetPixel = PaintDC.GetPixelXY
|
||||
DrawLine = PaintDC.DrawLineXY
|
||||
CrossHair = PaintDC.CrossHairXY
|
||||
DrawArc = PaintDC.DrawArcXY
|
||||
DrawCheckMark = PaintDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = PaintDC.DrawEllipticArcXY
|
||||
DrawPoint = PaintDC.DrawPointXY
|
||||
DrawRectangle = PaintDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = PaintDC.DrawRoundedRectangleXY
|
||||
DrawCircle = PaintDC.DrawCircleXY
|
||||
DrawEllipse = PaintDC.DrawEllipseXY
|
||||
DrawIcon = PaintDC.DrawIconXY
|
||||
DrawBitmap = PaintDC.DrawBitmapXY
|
||||
DrawText = PaintDC.DrawTextXY
|
||||
DrawRotatedText = PaintDC.DrawRotatedTextXY
|
||||
Blit = PaintDC.BlitXY
|
||||
|
||||
class WindowDC_old(WindowDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = WindowDC.FloodFillXY
|
||||
GetPixel = WindowDC.GetPixelXY
|
||||
DrawLine = WindowDC.DrawLineXY
|
||||
CrossHair = WindowDC.CrossHairXY
|
||||
DrawArc = WindowDC.DrawArcXY
|
||||
DrawCheckMark = WindowDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = WindowDC.DrawEllipticArcXY
|
||||
DrawPoint = WindowDC.DrawPointXY
|
||||
DrawRectangle = WindowDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = WindowDC.DrawRoundedRectangleXY
|
||||
DrawCircle = WindowDC.DrawCircleXY
|
||||
DrawEllipse = WindowDC.DrawEllipseXY
|
||||
DrawIcon = WindowDC.DrawIconXY
|
||||
DrawBitmap = WindowDC.DrawBitmapXY
|
||||
DrawText = WindowDC.DrawTextXY
|
||||
DrawRotatedText = WindowDC.DrawRotatedTextXY
|
||||
Blit = WindowDC.BlitXY
|
||||
|
||||
class MirrorDC_old(MirrorDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = MirrorDC.FloodFillXY
|
||||
GetPixel = MirrorDC.GetPixelXY
|
||||
DrawLine = MirrorDC.DrawLineXY
|
||||
CrossHair = MirrorDC.CrossHairXY
|
||||
DrawArc = MirrorDC.DrawArcXY
|
||||
DrawCheckMark = MirrorDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = MirrorDC.DrawEllipticArcXY
|
||||
DrawPoint = MirrorDC.DrawPointXY
|
||||
DrawRectangle = MirrorDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = MirrorDC.DrawRoundedRectangleXY
|
||||
DrawCircle = MirrorDC.DrawCircleXY
|
||||
DrawEllipse = MirrorDC.DrawEllipseXY
|
||||
DrawIcon = MirrorDC.DrawIconXY
|
||||
DrawBitmap = MirrorDC.DrawBitmapXY
|
||||
DrawText = MirrorDC.DrawTextXY
|
||||
DrawRotatedText = MirrorDC.DrawRotatedTextXY
|
||||
Blit = MirrorDC.BlitXY
|
||||
|
||||
class PostScriptDC_old(PostScriptDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = PostScriptDC.FloodFillXY
|
||||
GetPixel = PostScriptDC.GetPixelXY
|
||||
DrawLine = PostScriptDC.DrawLineXY
|
||||
CrossHair = PostScriptDC.CrossHairXY
|
||||
DrawArc = PostScriptDC.DrawArcXY
|
||||
DrawCheckMark = PostScriptDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = PostScriptDC.DrawEllipticArcXY
|
||||
DrawPoint = PostScriptDC.DrawPointXY
|
||||
DrawRectangle = PostScriptDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = PostScriptDC.DrawRoundedRectangleXY
|
||||
DrawCircle = PostScriptDC.DrawCircleXY
|
||||
DrawEllipse = PostScriptDC.DrawEllipseXY
|
||||
DrawIcon = PostScriptDC.DrawIconXY
|
||||
DrawBitmap = PostScriptDC.DrawBitmapXY
|
||||
DrawText = PostScriptDC.DrawTextXY
|
||||
DrawRotatedText = PostScriptDC.DrawRotatedTextXY
|
||||
Blit = PostScriptDC.BlitXY
|
||||
|
||||
class MetaFileDC_old(MetaFileDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = MetaFileDC.FloodFillXY
|
||||
GetPixel = MetaFileDC.GetPixelXY
|
||||
DrawLine = MetaFileDC.DrawLineXY
|
||||
CrossHair = MetaFileDC.CrossHairXY
|
||||
DrawArc = MetaFileDC.DrawArcXY
|
||||
DrawCheckMark = MetaFileDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = MetaFileDC.DrawEllipticArcXY
|
||||
DrawPoint = MetaFileDC.DrawPointXY
|
||||
DrawRectangle = MetaFileDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = MetaFileDC.DrawRoundedRectangleXY
|
||||
DrawCircle = MetaFileDC.DrawCircleXY
|
||||
DrawEllipse = MetaFileDC.DrawEllipseXY
|
||||
DrawIcon = MetaFileDC.DrawIconXY
|
||||
DrawBitmap = MetaFileDC.DrawBitmapXY
|
||||
DrawText = MetaFileDC.DrawTextXY
|
||||
DrawRotatedText = MetaFileDC.DrawRotatedTextXY
|
||||
Blit = MetaFileDC.BlitXY
|
||||
|
||||
class PrinterDC_old(PrinterDC):
|
||||
"""DC class that has methods with 2.4 compatible parameters."""
|
||||
FloodFill = PrinterDC.FloodFillXY
|
||||
GetPixel = PrinterDC.GetPixelXY
|
||||
DrawLine = PrinterDC.DrawLineXY
|
||||
CrossHair = PrinterDC.CrossHairXY
|
||||
DrawArc = PrinterDC.DrawArcXY
|
||||
DrawCheckMark = PrinterDC.DrawCheckMarkXY
|
||||
DrawEllipticArc = PrinterDC.DrawEllipticArcXY
|
||||
DrawPoint = PrinterDC.DrawPointXY
|
||||
DrawRectangle = PrinterDC.DrawRectangleXY
|
||||
DrawRoundedRectangle = PrinterDC.DrawRoundedRectangleXY
|
||||
DrawCircle = PrinterDC.DrawCircleXY
|
||||
DrawEllipse = PrinterDC.DrawEllipseXY
|
||||
DrawIcon = PrinterDC.DrawIconXY
|
||||
DrawBitmap = PrinterDC.DrawBitmapXY
|
||||
DrawText = PrinterDC.DrawTextXY
|
||||
DrawRotatedText = PrinterDC.DrawRotatedTextXY
|
||||
Blit = PrinterDC.BlitXY
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
IMAGELIST_DRAW_NORMAL = _gdi.IMAGELIST_DRAW_NORMAL
|
||||
|
||||
@ -3037,17 +3037,17 @@ static PyObject * Mask_swigregister(PyObject *self, PyObject *args) {
|
||||
static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxString *arg1 = 0 ;
|
||||
long arg2 ;
|
||||
int arg2 ;
|
||||
int arg3 = (int) -1 ;
|
||||
int arg4 = (int) -1 ;
|
||||
wxIcon *result;
|
||||
bool temp1 = False ;
|
||||
PyObject * obj0 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "name",(char *) "flags",(char *) "desiredWidth",(char *) "desiredHeight", NULL
|
||||
(char *) "name",(char *) "type",(char *) "desiredWidth",(char *) "desiredHeight", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Ol|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"Oi|ii:new_Icon",kwnames,&obj0,&arg2,&arg3,&arg4)) goto fail;
|
||||
{
|
||||
arg1 = wxString_in_helper(obj0);
|
||||
if (arg1 == NULL) SWIG_fail;
|
||||
@ -3055,7 +3055,7 @@ static PyObject *_wrap_new_Icon(PyObject *self, PyObject *args, PyObject *kwargs
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (wxIcon *)new wxIcon((wxString const &)*arg1,arg2,arg3,arg4);
|
||||
result = (wxIcon *)new wxIcon((wxString const &)*arg1,(wxBitmapType )arg2,arg3,arg4);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
@ -3206,16 +3206,16 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k
|
||||
PyObject *resultobj;
|
||||
wxIcon *arg1 = (wxIcon *) 0 ;
|
||||
wxString *arg2 = 0 ;
|
||||
long arg3 ;
|
||||
int arg3 ;
|
||||
bool result;
|
||||
bool temp2 = False ;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self",(char *) "name",(char *) "flags", NULL
|
||||
(char *) "self",(char *) "name",(char *) "type", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOl:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail;
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOi:Icon_LoadFile",kwnames,&obj0,&obj1,&arg3)) goto fail;
|
||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxIcon,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
{
|
||||
arg2 = wxString_in_helper(obj1);
|
||||
@ -3224,7 +3224,7 @@ static PyObject *_wrap_Icon_LoadFile(PyObject *self, PyObject *args, PyObject *k
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = (bool)(arg1)->LoadFile((wxString const &)*arg2,arg3);
|
||||
result = (bool)(arg1)->LoadFile((wxString const &)*arg2,(wxBitmapType )arg3);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
|
||||
@ -1224,6 +1224,10 @@ class Grid(windows.ScrolledWindow):
|
||||
wxGridSelectCells = _grid.Grid_wxGridSelectCells
|
||||
wxGridSelectRows = _grid.Grid_wxGridSelectRows
|
||||
wxGridSelectColumns = _grid.Grid_wxGridSelectColumns
|
||||
SelectCells = wxGridSelectCells
|
||||
SelectRows = wxGridSelectRows
|
||||
SelectColumns = wxGridSelectColumns,
|
||||
|
||||
def CreateGrid(*args, **kwargs):
|
||||
"""CreateGrid(int numRows, int numCols, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
|
||||
return _grid.Grid_CreateGrid(*args, **kwargs)
|
||||
|
||||
@ -282,7 +282,7 @@ static swig_type_info *swig_types[52];
|
||||
|
||||
static const wxString wxPyEmptyString(wxEmptyString);
|
||||
static const wxString wxPyPanelNameStr(wxPanelNameStr);
|
||||
static const wxString wxPyDateTimeFormatStr(wxT(wxT("%c")));
|
||||
static const wxString wxPyDateTimeFormatStr(wxT("%c"));
|
||||
|
||||
|
||||
#define wxPyMake_TEMPLATE(TYPE) \
|
||||
|
||||
@ -4334,14 +4334,6 @@ class MetafileDataObject(DataObjectSimple):
|
||||
self.this = newobj.this
|
||||
self.thisown = 1
|
||||
del newobj.thisown
|
||||
def SetMetafile(*args, **kwargs):
|
||||
"""SetMetafile(wxMetafile metafile)"""
|
||||
return _misc.MetafileDataObject_SetMetafile(*args, **kwargs)
|
||||
|
||||
def GetMetafile(*args, **kwargs):
|
||||
"""GetMetafile() -> wxMetafile"""
|
||||
return _misc.MetafileDataObject_GetMetafile(*args, **kwargs)
|
||||
|
||||
|
||||
class MetafileDataObjectPtr(MetafileDataObject):
|
||||
def __init__(self, this):
|
||||
@ -4370,7 +4362,7 @@ class DropSource(object):
|
||||
return "<%s.%s; proxy of C++ wxPyDropSource instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
|
||||
def __init__(self, *args, **kwargs):
|
||||
"""
|
||||
__init__(Window win=None, Cursor copy=wxNullCursor, Cursor move=wxNullCursor,
|
||||
__init__(Window win, Cursor copy=wxNullCursor, Cursor move=wxNullCursor,
|
||||
Cursor none=wxNullCursor) -> DropSource
|
||||
"""
|
||||
newobj = _misc.new_DropSource(*args, **kwargs)
|
||||
|
||||
@ -211,88 +211,87 @@ SWIGIMPORT(void) SWIG_Python_InstallConstants(PyObject *d, swig_con
|
||||
|
||||
#define SWIGTYPE_p_wxLogChain swig_types[0]
|
||||
#define SWIGTYPE_p_wxMutexGuiLocker swig_types[1]
|
||||
#define SWIGTYPE_p_wxMetafile swig_types[2]
|
||||
#define SWIGTYPE_p_wxFileHistory swig_types[3]
|
||||
#define SWIGTYPE_p_wxLog swig_types[4]
|
||||
#define SWIGTYPE_p_wxDateTime__TimeZone swig_types[5]
|
||||
#define SWIGTYPE_p_wxMenu swig_types[6]
|
||||
#define SWIGTYPE_p_wxEvent swig_types[7]
|
||||
#define SWIGTYPE_p_wxConfigBase swig_types[8]
|
||||
#define SWIGTYPE_p_wxWave swig_types[9]
|
||||
#define SWIGTYPE_p_wxFileType swig_types[10]
|
||||
#define SWIGTYPE_p_wxLogGui swig_types[11]
|
||||
#define SWIGTYPE_p_wxFont swig_types[12]
|
||||
#define SWIGTYPE_p_wxDataFormat swig_types[13]
|
||||
#define SWIGTYPE_p_wxTimerEvent swig_types[14]
|
||||
#define SWIGTYPE_p_wxCaret swig_types[15]
|
||||
#define SWIGTYPE_p_int swig_types[16]
|
||||
#define SWIGTYPE_p_wxSize swig_types[17]
|
||||
#define SWIGTYPE_p_wxClipboard swig_types[18]
|
||||
#define SWIGTYPE_p_wxStopWatch swig_types[19]
|
||||
#define SWIGTYPE_p_wxDC swig_types[20]
|
||||
#define SWIGTYPE_p_wxClipboardLocker swig_types[21]
|
||||
#define SWIGTYPE_p_wxIcon swig_types[22]
|
||||
#define SWIGTYPE_p_wxLogStderr swig_types[23]
|
||||
#define SWIGTYPE_p_wxLogTextCtrl swig_types[24]
|
||||
#define SWIGTYPE_p_wxTextCtrl swig_types[25]
|
||||
#define SWIGTYPE_p_wxBusyCursor swig_types[26]
|
||||
#define SWIGTYPE_p_wxFileDataObject swig_types[27]
|
||||
#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[28]
|
||||
#define SWIGTYPE_p_wxPyTextDataObject swig_types[29]
|
||||
#define SWIGTYPE_p_wxBitmapDataObject swig_types[30]
|
||||
#define SWIGTYPE_p_wxTextDataObject swig_types[31]
|
||||
#define SWIGTYPE_p_wxDataObject swig_types[32]
|
||||
#define SWIGTYPE_p_wxCustomDataObject swig_types[33]
|
||||
#define SWIGTYPE_p_wxURLDataObject swig_types[34]
|
||||
#define SWIGTYPE_p_wxMetafileDataObject swig_types[35]
|
||||
#define SWIGTYPE_p_wxTimerRunner swig_types[36]
|
||||
#define SWIGTYPE_p_wxLogWindow swig_types[37]
|
||||
#define SWIGTYPE_p_wxTimeSpan swig_types[38]
|
||||
#define SWIGTYPE_p_wxArrayString swig_types[39]
|
||||
#define SWIGTYPE_p_wxWindowDisabler swig_types[40]
|
||||
#define SWIGTYPE_p_wxToolTip swig_types[41]
|
||||
#define SWIGTYPE_p_wxDataObjectComposite swig_types[42]
|
||||
#define SWIGTYPE_p_wxFileConfig swig_types[43]
|
||||
#define SWIGTYPE_p_wxSystemSettings swig_types[44]
|
||||
#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[45]
|
||||
#define SWIGTYPE_p_wxDataObjectSimple swig_types[46]
|
||||
#define SWIGTYPE_p_wxEvtHandler swig_types[47]
|
||||
#define SWIGTYPE_p_wxRect swig_types[48]
|
||||
#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[49]
|
||||
#define SWIGTYPE_p_wxFileTypeInfo swig_types[50]
|
||||
#define SWIGTYPE_p_wxFrame swig_types[51]
|
||||
#define SWIGTYPE_p_wxTimer swig_types[52]
|
||||
#define SWIGTYPE_p_wxMimeTypesManager swig_types[53]
|
||||
#define SWIGTYPE_p_wxPyArtProvider swig_types[54]
|
||||
#define SWIGTYPE_p_wxPyTipProvider swig_types[55]
|
||||
#define SWIGTYPE_p_wxTipProvider swig_types[56]
|
||||
#define SWIGTYPE_p_wxJoystick swig_types[57]
|
||||
#define SWIGTYPE_p_wxSystemOptions swig_types[58]
|
||||
#define SWIGTYPE_p_wxPoint swig_types[59]
|
||||
#define SWIGTYPE_p_wxJoystickEvent swig_types[60]
|
||||
#define SWIGTYPE_p_wxCursor swig_types[61]
|
||||
#define SWIGTYPE_p_wxObject swig_types[62]
|
||||
#define SWIGTYPE_p_wxOutputStream swig_types[63]
|
||||
#define SWIGTYPE_p_wxDateTime swig_types[64]
|
||||
#define SWIGTYPE_p_wxPyDropSource swig_types[65]
|
||||
#define SWIGTYPE_p_wxWindow swig_types[66]
|
||||
#define SWIGTYPE_p_wxString swig_types[67]
|
||||
#define SWIGTYPE_p_wxPyProcess swig_types[68]
|
||||
#define SWIGTYPE_p_wxBitmap swig_types[69]
|
||||
#define SWIGTYPE_p_wxConfig swig_types[70]
|
||||
#define SWIGTYPE_p_wxChar swig_types[71]
|
||||
#define SWIGTYPE_p_wxBusyInfo swig_types[72]
|
||||
#define SWIGTYPE_p_wxPyDropTarget swig_types[73]
|
||||
#define SWIGTYPE_p_wxPyTextDropTarget swig_types[74]
|
||||
#define SWIGTYPE_p_wxPyFileDropTarget swig_types[75]
|
||||
#define SWIGTYPE_p_wxProcessEvent swig_types[76]
|
||||
#define SWIGTYPE_p_wxPyLog swig_types[77]
|
||||
#define SWIGTYPE_p_wxLogNull swig_types[78]
|
||||
#define SWIGTYPE_p_wxColour swig_types[79]
|
||||
#define SWIGTYPE_p_wxConfigPathChanger swig_types[80]
|
||||
#define SWIGTYPE_p_wxPyTimer swig_types[81]
|
||||
#define SWIGTYPE_p_wxDateSpan swig_types[82]
|
||||
static swig_type_info *swig_types[84];
|
||||
#define SWIGTYPE_p_wxFileHistory swig_types[2]
|
||||
#define SWIGTYPE_p_wxLog swig_types[3]
|
||||
#define SWIGTYPE_p_wxDateTime__TimeZone swig_types[4]
|
||||
#define SWIGTYPE_p_wxMenu swig_types[5]
|
||||
#define SWIGTYPE_p_wxEvent swig_types[6]
|
||||
#define SWIGTYPE_p_wxConfigBase swig_types[7]
|
||||
#define SWIGTYPE_p_wxWave swig_types[8]
|
||||
#define SWIGTYPE_p_wxFileType swig_types[9]
|
||||
#define SWIGTYPE_p_wxLogGui swig_types[10]
|
||||
#define SWIGTYPE_p_wxFont swig_types[11]
|
||||
#define SWIGTYPE_p_wxDataFormat swig_types[12]
|
||||
#define SWIGTYPE_p_wxTimerEvent swig_types[13]
|
||||
#define SWIGTYPE_p_wxCaret swig_types[14]
|
||||
#define SWIGTYPE_p_int swig_types[15]
|
||||
#define SWIGTYPE_p_wxSize swig_types[16]
|
||||
#define SWIGTYPE_p_wxClipboard swig_types[17]
|
||||
#define SWIGTYPE_p_wxStopWatch swig_types[18]
|
||||
#define SWIGTYPE_p_wxDC swig_types[19]
|
||||
#define SWIGTYPE_p_wxClipboardLocker swig_types[20]
|
||||
#define SWIGTYPE_p_wxIcon swig_types[21]
|
||||
#define SWIGTYPE_p_wxLogStderr swig_types[22]
|
||||
#define SWIGTYPE_p_wxLogTextCtrl swig_types[23]
|
||||
#define SWIGTYPE_p_wxTextCtrl swig_types[24]
|
||||
#define SWIGTYPE_p_wxBusyCursor swig_types[25]
|
||||
#define SWIGTYPE_p_wxFileDataObject swig_types[26]
|
||||
#define SWIGTYPE_p_wxPyBitmapDataObject swig_types[27]
|
||||
#define SWIGTYPE_p_wxPyTextDataObject swig_types[28]
|
||||
#define SWIGTYPE_p_wxBitmapDataObject swig_types[29]
|
||||
#define SWIGTYPE_p_wxTextDataObject swig_types[30]
|
||||
#define SWIGTYPE_p_wxDataObject swig_types[31]
|
||||
#define SWIGTYPE_p_wxCustomDataObject swig_types[32]
|
||||
#define SWIGTYPE_p_wxURLDataObject swig_types[33]
|
||||
#define SWIGTYPE_p_wxMetafileDataObject swig_types[34]
|
||||
#define SWIGTYPE_p_wxTimerRunner swig_types[35]
|
||||
#define SWIGTYPE_p_wxLogWindow swig_types[36]
|
||||
#define SWIGTYPE_p_wxTimeSpan swig_types[37]
|
||||
#define SWIGTYPE_p_wxArrayString swig_types[38]
|
||||
#define SWIGTYPE_p_wxWindowDisabler swig_types[39]
|
||||
#define SWIGTYPE_p_wxToolTip swig_types[40]
|
||||
#define SWIGTYPE_p_wxDataObjectComposite swig_types[41]
|
||||
#define SWIGTYPE_p_wxFileConfig swig_types[42]
|
||||
#define SWIGTYPE_p_wxSystemSettings swig_types[43]
|
||||
#define SWIGTYPE_p_wxPyDataObjectSimple swig_types[44]
|
||||
#define SWIGTYPE_p_wxDataObjectSimple swig_types[45]
|
||||
#define SWIGTYPE_p_wxEvtHandler swig_types[46]
|
||||
#define SWIGTYPE_p_wxRect swig_types[47]
|
||||
#define SWIGTYPE_p_wxSingleInstanceChecker swig_types[48]
|
||||
#define SWIGTYPE_p_wxFileTypeInfo swig_types[49]
|
||||
#define SWIGTYPE_p_wxFrame swig_types[50]
|
||||
#define SWIGTYPE_p_wxTimer swig_types[51]
|
||||
#define SWIGTYPE_p_wxMimeTypesManager swig_types[52]
|
||||
#define SWIGTYPE_p_wxPyArtProvider swig_types[53]
|
||||
#define SWIGTYPE_p_wxPyTipProvider swig_types[54]
|
||||
#define SWIGTYPE_p_wxTipProvider swig_types[55]
|
||||
#define SWIGTYPE_p_wxJoystick swig_types[56]
|
||||
#define SWIGTYPE_p_wxSystemOptions swig_types[57]
|
||||
#define SWIGTYPE_p_wxPoint swig_types[58]
|
||||
#define SWIGTYPE_p_wxJoystickEvent swig_types[59]
|
||||
#define SWIGTYPE_p_wxCursor swig_types[60]
|
||||
#define SWIGTYPE_p_wxObject swig_types[61]
|
||||
#define SWIGTYPE_p_wxOutputStream swig_types[62]
|
||||
#define SWIGTYPE_p_wxDateTime swig_types[63]
|
||||
#define SWIGTYPE_p_wxPyDropSource swig_types[64]
|
||||
#define SWIGTYPE_p_wxWindow swig_types[65]
|
||||
#define SWIGTYPE_p_wxString swig_types[66]
|
||||
#define SWIGTYPE_p_wxPyProcess swig_types[67]
|
||||
#define SWIGTYPE_p_wxBitmap swig_types[68]
|
||||
#define SWIGTYPE_p_wxConfig swig_types[69]
|
||||
#define SWIGTYPE_p_wxChar swig_types[70]
|
||||
#define SWIGTYPE_p_wxBusyInfo swig_types[71]
|
||||
#define SWIGTYPE_p_wxPyDropTarget swig_types[72]
|
||||
#define SWIGTYPE_p_wxPyTextDropTarget swig_types[73]
|
||||
#define SWIGTYPE_p_wxPyFileDropTarget swig_types[74]
|
||||
#define SWIGTYPE_p_wxProcessEvent swig_types[75]
|
||||
#define SWIGTYPE_p_wxPyLog swig_types[76]
|
||||
#define SWIGTYPE_p_wxLogNull swig_types[77]
|
||||
#define SWIGTYPE_p_wxColour swig_types[78]
|
||||
#define SWIGTYPE_p_wxConfigPathChanger swig_types[79]
|
||||
#define SWIGTYPE_p_wxPyTimer swig_types[80]
|
||||
#define SWIGTYPE_p_wxDateSpan swig_types[81]
|
||||
static swig_type_info *swig_types[83];
|
||||
|
||||
/* -------- TYPES TABLE (END) -------- */
|
||||
|
||||
@ -840,8 +839,8 @@ bool wxConfigBase_ReadBool(wxConfigBase *self,wxString const &key,bool defaultVa
|
||||
#include <wx/datetime.h>
|
||||
|
||||
|
||||
static const wxString wxPyDateFormatStr(wxT(wxT("%c")));
|
||||
static const wxString wxPyTimeSpanFormatStr(wxT(wxT("%H:%M:%S")));
|
||||
static const wxString wxPyDateFormatStr(wxT("%c"));
|
||||
static const wxString wxPyTimeSpanFormatStr(wxT("%H:%M:%S"));
|
||||
|
||||
#define LOCAL_TZ wxDateTime::Local
|
||||
|
||||
@ -1039,9 +1038,11 @@ PyObject *wxCustomDataObject_GetData(wxCustomDataObject *self){
|
||||
return PyString_FromStringAndSize((char*)self->GetData(), self->GetSize());
|
||||
}
|
||||
|
||||
#include <wx/metafile.h>
|
||||
|
||||
|
||||
class wxMetafileDataObject : public wxDataObjectSimple
|
||||
{
|
||||
public:
|
||||
wxMetafileDataObject() { wxPyRaiseNotImplemented(); }
|
||||
};
|
||||
|
||||
|
||||
IMP_PYCALLBACK_BOOL_DR(wxPyDropSource, wxDropSource, GiveFeedback);
|
||||
@ -23246,65 +23247,6 @@ static PyObject *_wrap_new_MetafileDataObject(PyObject *self, PyObject *args, Py
|
||||
}
|
||||
|
||||
|
||||
static PyObject *_wrap_MetafileDataObject_SetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ;
|
||||
wxMetafile *arg2 = 0 ;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self",(char *) "metafile", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:MetafileDataObject_SetMetafile",kwnames,&obj0,&obj1)) goto fail;
|
||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetafileDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxMetafile,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
if (arg2 == NULL) {
|
||||
PyErr_SetString(PyExc_TypeError,"null reference"); SWIG_fail;
|
||||
}
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
(arg1)->SetMetafile((wxMetafile const &)*arg2);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
Py_INCREF(Py_None); resultobj = Py_None;
|
||||
return resultobj;
|
||||
fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static PyObject *_wrap_MetafileDataObject_GetMetafile(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxMetafileDataObject *arg1 = (wxMetafileDataObject *) 0 ;
|
||||
wxMetafile result;
|
||||
PyObject * obj0 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:MetafileDataObject_GetMetafile",kwnames,&obj0)) goto fail;
|
||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxMetafileDataObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
result = ((wxMetafileDataObject const *)arg1)->GetMetafile();
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
{
|
||||
wxMetafile * resultptr;
|
||||
resultptr = new wxMetafile((wxMetafile &) result);
|
||||
resultobj = SWIG_NewPointerObj((void *) resultptr, SWIGTYPE_p_wxMetafile, 1);
|
||||
}
|
||||
return resultobj;
|
||||
fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static PyObject * MetafileDataObject_swigregister(PyObject *self, PyObject *args) {
|
||||
PyObject *obj;
|
||||
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
|
||||
@ -23337,7 +23279,7 @@ static PyObject *_wrap_IsDragResultOk(PyObject *self, PyObject *args, PyObject *
|
||||
|
||||
static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxWindow *arg1 = (wxWindow *) NULL ;
|
||||
wxWindow *arg1 = (wxWindow *) 0 ;
|
||||
wxCursor const &arg2_defvalue = wxNullCursor ;
|
||||
wxCursor *arg2 = (wxCursor *) &arg2_defvalue ;
|
||||
wxCursor const &arg3_defvalue = wxNullCursor ;
|
||||
@ -23353,10 +23295,8 @@ static PyObject *_wrap_new_DropSource(PyObject *self, PyObject *args, PyObject *
|
||||
(char *) "win",(char *) "copy",(char *) "move",(char *) "none", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"|OOOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
|
||||
if (obj0) {
|
||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
}
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OOO:new_DropSource",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
|
||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxWindow,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
if (obj1) {
|
||||
if ((SWIG_ConvertPtr(obj1,(void **) &arg2, SWIGTYPE_p_wxCursor,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
if (arg2 == NULL) {
|
||||
@ -25369,8 +25309,6 @@ static PyMethodDef SwigMethods[] = {
|
||||
{ (char *)"URLDataObject_SetURL", (PyCFunction) _wrap_URLDataObject_SetURL, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"URLDataObject_swigregister", URLDataObject_swigregister, METH_VARARGS },
|
||||
{ (char *)"new_MetafileDataObject", (PyCFunction) _wrap_new_MetafileDataObject, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"MetafileDataObject_SetMetafile", (PyCFunction) _wrap_MetafileDataObject_SetMetafile, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"MetafileDataObject_GetMetafile", (PyCFunction) _wrap_MetafileDataObject_GetMetafile, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"MetafileDataObject_swigregister", MetafileDataObject_swigregister, METH_VARARGS },
|
||||
{ (char *)"IsDragResultOk", (PyCFunction) _wrap_IsDragResultOk, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"new_DropSource", (PyCFunction) _wrap_new_DropSource, METH_VARARGS | METH_KEYWORDS },
|
||||
@ -25935,7 +25873,6 @@ static void *_p_wxPyFileDropTargetTo_p_wxPyDropTarget(void *x) {
|
||||
}
|
||||
static swig_type_info _swigt__p_wxLogChain[] = {{"_p_wxLogChain", 0, "wxLogChain *", 0},{"_p_wxLogChain"},{0}};
|
||||
static swig_type_info _swigt__p_wxMutexGuiLocker[] = {{"_p_wxMutexGuiLocker", 0, "wxMutexGuiLocker *", 0},{"_p_wxMutexGuiLocker"},{0}};
|
||||
static swig_type_info _swigt__p_wxMetafile[] = {{"_p_wxMetafile", 0, "wxMetafile *", 0},{"_p_wxMetafile"},{0}};
|
||||
static swig_type_info _swigt__p_wxFileHistory[] = {{"_p_wxFileHistory", 0, "wxFileHistory *", 0},{"_p_wxFileHistory"},{0}};
|
||||
static swig_type_info _swigt__p_wxLog[] = {{"_p_wxLog", 0, "wxLog *", 0},{"_p_wxLogStderr", _p_wxLogStderrTo_p_wxLog},{"_p_wxLogTextCtrl", _p_wxLogTextCtrlTo_p_wxLog},{"_p_wxLogWindow", _p_wxLogWindowTo_p_wxLog},{"_p_wxLogChain", _p_wxLogChainTo_p_wxLog},{"_p_wxLogGui", _p_wxLogGuiTo_p_wxLog},{"_p_wxPyLog", _p_wxPyLogTo_p_wxLog},{"_p_wxLog"},{0}};
|
||||
static swig_type_info _swigt__p_wxDateTime__TimeZone[] = {{"_p_wxDateTime__TimeZone", 0, "wxDateTime::TimeZone *", 0},{"_p_wxDateTime__TimeZone"},{0}};
|
||||
@ -26020,7 +25957,6 @@ static swig_type_info _swigt__p_wxDateSpan[] = {{"_p_wxDateSpan", 0, "wxDateSpan
|
||||
static swig_type_info *swig_types_initial[] = {
|
||||
_swigt__p_wxLogChain,
|
||||
_swigt__p_wxMutexGuiLocker,
|
||||
_swigt__p_wxMetafile,
|
||||
_swigt__p_wxFileHistory,
|
||||
_swigt__p_wxLog,
|
||||
_swigt__p_wxDateTime__TimeZone,
|
||||
|
||||
@ -422,10 +422,6 @@ class Dialog(TopLevelWindow):
|
||||
"""CreateButtonSizer(long flags) -> Sizer"""
|
||||
return _windows.Dialog_CreateButtonSizer(*args, **kwargs)
|
||||
|
||||
def SetModal(*args, **kwargs):
|
||||
"""SetModal(bool flag)"""
|
||||
return _windows.Dialog_SetModal(*args, **kwargs)
|
||||
|
||||
def IsModal(*args, **kwargs):
|
||||
"""IsModal() -> bool"""
|
||||
return _windows.Dialog_IsModal(*args, **kwargs)
|
||||
|
||||
@ -356,9 +356,9 @@ wxRect wxStatusBar_GetFieldRect(wxStatusBar *self,int i){
|
||||
self->GetFieldRect(i, r);
|
||||
return r;
|
||||
}
|
||||
static const wxString wxPySplitterNameStr(wxT(wxT("splitter")));
|
||||
static const wxString wxPySashNameStr(wxT(wxT("sashWindow")));
|
||||
static const wxString wxPySashLayoutNameStr(wxT(wxT("layoutWindow")));
|
||||
static const wxString wxPySplitterNameStr(wxT("splitter"));
|
||||
static const wxString wxPySashNameStr(wxT("sashWindow"));
|
||||
static const wxString wxPySashLayoutNameStr(wxT("layoutWindow"));
|
||||
|
||||
#include <wx/popupwin.h>
|
||||
|
||||
@ -782,8 +782,8 @@ IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
|
||||
#include "wx/wxPython/printfw.h"
|
||||
|
||||
|
||||
static const wxString wxPyPrintoutTitleStr(wxT(wxT("Printout")));
|
||||
static const wxString wxPyPreviewCanvasNameStr(wxT(wxT("previewcanvas")));
|
||||
static const wxString wxPyPrintoutTitleStr(wxT("Printout"));
|
||||
static const wxString wxPyPreviewCanvasNameStr(wxT("previewcanvas"));
|
||||
|
||||
|
||||
|
||||
@ -3660,34 +3660,6 @@ static PyObject *_wrap_Dialog_CreateButtonSizer(PyObject *self, PyObject *args,
|
||||
}
|
||||
|
||||
|
||||
static PyObject *_wrap_Dialog_SetModal(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxDialog *arg1 = (wxDialog *) 0 ;
|
||||
bool arg2 ;
|
||||
PyObject * obj0 = 0 ;
|
||||
PyObject * obj1 = 0 ;
|
||||
char *kwnames[] = {
|
||||
(char *) "self",(char *) "flag", NULL
|
||||
};
|
||||
|
||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Dialog_SetModal",kwnames,&obj0,&obj1)) goto fail;
|
||||
if ((SWIG_ConvertPtr(obj0,(void **) &arg1, SWIGTYPE_p_wxDialog,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
|
||||
arg2 = PyInt_AsLong(obj1) ? true : false;
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
{
|
||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||
(arg1)->SetModal(arg2);
|
||||
|
||||
wxPyEndAllowThreads(__tstate);
|
||||
if (PyErr_Occurred()) SWIG_fail;
|
||||
}
|
||||
Py_INCREF(Py_None); resultobj = Py_None;
|
||||
return resultobj;
|
||||
fail:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static PyObject *_wrap_Dialog_IsModal(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||
PyObject *resultobj;
|
||||
wxDialog *arg1 = (wxDialog *) 0 ;
|
||||
@ -21141,7 +21113,6 @@ static PyMethodDef SwigMethods[] = {
|
||||
{ (char *)"Dialog_GetReturnCode", (PyCFunction) _wrap_Dialog_GetReturnCode, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"Dialog_CreateTextSizer", (PyCFunction) _wrap_Dialog_CreateTextSizer, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"Dialog_CreateButtonSizer", (PyCFunction) _wrap_Dialog_CreateButtonSizer, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"Dialog_SetModal", (PyCFunction) _wrap_Dialog_SetModal, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"Dialog_IsModal", (PyCFunction) _wrap_Dialog_IsModal, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"Dialog_ShowModal", (PyCFunction) _wrap_Dialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
|
||||
{ (char *)"Dialog_EndModal", (PyCFunction) _wrap_Dialog_EndModal, METH_VARARGS | METH_KEYWORDS },
|
||||
|
||||
@ -147,6 +147,8 @@ wxPreSpinButton = wx.controls.PreSpinButton
|
||||
wxSpinCtrl = wx.controls.SpinCtrl
|
||||
wxSpinCtrlPtr = wx.controls.SpinCtrlPtr
|
||||
wxPreSpinCtrl = wx.controls.PreSpinCtrl
|
||||
wxSpinEvent = wx.controls.SpinEvent
|
||||
wxSpinEventPtr = wx.controls.SpinEventPtr
|
||||
wxEVT_COMMAND_SPINCTRL_UPDATED = wx.controls.wxEVT_COMMAND_SPINCTRL_UPDATED
|
||||
wxRadioBoxNameStr = wx.controls.RadioBoxNameStr
|
||||
wxRadioButtonNameStr = wx.controls.RadioButtonNameStr
|
||||
|
||||
Loading…
Reference in New Issue
Block a user