AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26169 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-03-10 04:16:12 +00:00
parent ce7284bd97
commit fe76311545
14 changed files with 1982 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wxPython/contrib/gizmos/msw/gizmos.py
View File

@ -429,6 +429,8 @@ class TreeListCtrl(core.Control):
Size size=DefaultSize, long style=TR_DEFAULT_STYLE,
Validator validator=DefaultValidator,
String name=TreeListCtrlNameStr) -> bool
Do the 2nd phase and create the GUI control.
"""
return _gizmos.TreeListCtrl_Create(*args, **kwargs)

5
wxPython/contrib/ogl/msw/ogl_wrap.cpp
View File

@ -13300,7 +13300,10 @@ static PyObject *_wrap_PyBitmapShape_GetBitmap(PyObject *self, PyObject *args, P
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);
{
wxBitmap* resultptr = new wxBitmap(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
}
return resultobj;
fail:
return NULL;

4
wxPython/src/msw/controls.py
View File

@ -3625,6 +3625,10 @@ class ListCtrl(core.Control):
"""AssignImageList(ImageList imageList, int which)"""
return _controls.ListCtrl_AssignImageList(*args, **kwargs)
def InReportView(*args, **kwargs):
"""InReportView() -> bool"""
return _controls.ListCtrl_InReportView(*args, **kwargs)
def IsVirtual(*args, **kwargs):
"""IsVirtual() -> bool"""
return _controls.ListCtrl_IsVirtual(*args, **kwargs)

45
wxPython/src/msw/controls_wrap.cpp
View File

@ -961,6 +961,8 @@ public:
DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
PYPRIVATE;
};
@ -990,6 +992,7 @@ IMP_PYCALLBACK_SIZE_const(wxPyControl, wxControl, GetMaxSize);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, AddChild);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyControl, wxControl, RemoveChild);
IMP_PYCALLBACK_BOOL_(wxPyControl, wxControl, ShouldInheritColours);
@ -7144,7 +7147,10 @@ static PyObject *_wrap_TextAttr_GetFont(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
{
wxFont* resultptr = new wxFont(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxFont, 1);
}
return resultobj;
fail:
return NULL;
@ -15238,7 +15244,10 @@ static PyObject *_wrap_ToolBarToolBase_GetNormalBitmap(PyObject *self, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);
{
wxBitmap* resultptr = new wxBitmap(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
}
return resultobj;
fail:
return NULL;
@ -15267,7 +15276,10 @@ static PyObject *_wrap_ToolBarToolBase_GetDisabledBitmap(PyObject *self, PyObjec
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);
{
wxBitmap* resultptr = new wxBitmap(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
}
return resultobj;
fail:
return NULL;
@ -21409,6 +21421,32 @@ static PyObject *_wrap_ListCtrl_AssignImageList(PyObject *self, PyObject *args,
}
static PyObject *_wrap_ListCtrl_InReportView(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
bool result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:ListCtrl_InReportView",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyListCtrl,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)((wxPyListCtrl const *)arg1)->InReportView();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_ListCtrl_IsVirtual(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyListCtrl *arg1 = (wxPyListCtrl *) 0 ;
@ -30458,6 +30496,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ListCtrl_GetImageList", (PyCFunction) _wrap_ListCtrl_GetImageList, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ListCtrl_SetImageList", (PyCFunction) _wrap_ListCtrl_SetImageList, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ListCtrl_AssignImageList", (PyCFunction) _wrap_ListCtrl_AssignImageList, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ListCtrl_InReportView", (PyCFunction) _wrap_ListCtrl_InReportView, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ListCtrl_IsVirtual", (PyCFunction) _wrap_ListCtrl_IsVirtual, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ListCtrl_RefreshItem", (PyCFunction) _wrap_ListCtrl_RefreshItem, METH_VARARGS | METH_KEYWORDS },
{ (char *)"ListCtrl_RefreshItems", (PyCFunction) _wrap_ListCtrl_RefreshItems, METH_VARARGS | METH_KEYWORDS },

71
wxPython/src/msw/core.py
View File

@ -5229,6 +5229,11 @@ def GetAccelFromString(*args, **kwargs):
return _core.GetAccelFromString(*args, **kwargs)
#---------------------------------------------------------------------------
WINDOW_VARIANT_DEFAULT = _core.WINDOW_VARIANT_DEFAULT
WINDOW_VARIANT_NORMAL = _core.WINDOW_VARIANT_NORMAL
WINDOW_VARIANT_SMALL = _core.WINDOW_VARIANT_SMALL
WINDOW_VARIANT_MINI = _core.WINDOW_VARIANT_MINI
WINDOW_VARIANT_LARGE = _core.WINDOW_VARIANT_LARGE
class Window(EvtHandler):
"""
wx.Window is the base class for all windows and represents any visible
@ -5350,12 +5355,13 @@ class Window(EvtHandler):
"""
GetLabel() -> String
Generic way of getting a label from any window, for identification
purposes. The interpretation of this function differs from class to
class. For frames and dialogs, the value returned is the title. For
buttons or static text controls, it is the button text. This function
can be useful for meta-programs (such as testing tools or
special-needs access programs) which need to identify windows by name.
Generic way of getting a label from any window, for
identification purposes. The interpretation of this function
differs from class to class. For frames and dialogs, the value
returned is the title. For buttons or static text controls, it is
the button text. This function can be useful for meta-programs
(such as testing tools or special-needs access programs) which
need to identify windows by name.
"""
return _core.Window_GetLabel(*args, **kwargs)
@ -5363,8 +5369,8 @@ class Window(EvtHandler):
"""
SetName(String name)
Sets the window's name. The window name is used for ressource setting
in X, it is not the same as the window title/label
Sets the window's name. The window name is used for ressource
setting in X, it is not the same as the window title/label
"""
return _core.Window_SetName(*args, **kwargs)
@ -5372,12 +5378,25 @@ class Window(EvtHandler):
"""
GetName() -> String
Returns the window's name. This name is not guaranteed to be unique;
it is up to the programmer to supply an appropriate name in the window
constructor or via wx.Window.SetName.
Returns the window's name. This name is not guaranteed to be
unique; it is up to the programmer to supply an appropriate name
in the window constructor or via wx.Window.SetName.
"""
return _core.Window_GetName(*args, **kwargs)
def SetWindowVariant(*args, **kwargs):
"""
SetWindowVariant(int variant)
Sets the variant of the window/font size to use for this window,
if the platform supports variants, (for example, wxMac.)
"""
return _core.Window_SetWindowVariant(*args, **kwargs)
def GetWindowVariant(*args, **kwargs):
"""GetWindowVariant() -> int"""
return _core.Window_GetWindowVariant(*args, **kwargs)
def SetId(*args, **kwargs):
"""
SetId(int winid)
@ -6384,9 +6403,10 @@ class Window(EvtHandler):
"""
Freeze()
Freezes the window or, in other words, prevents any updates from
taking place on screen, the window is not redrawn at all. Thaw must be
called to reenable window redrawing.
Freezes the window or, in other words, prevents any updates from taking place
on screen, the window is not redrawn at all. Thaw must be called to reenable
window redrawing. Calls to Freeze/Thaw may be nested, with the actual Thaw
being delayed until all the nesting has been undone.
This method is useful for visual appearance optimization (for example,
it is a good idea to use it before inserting large amount of text into
@ -6400,7 +6420,9 @@ class Window(EvtHandler):
"""
Thaw()
Reenables window updating after a previous call to Freeze.
Reenables window updating after a previous call to Freeze. Calls to
Freeze/Thaw may be nested, so Thaw must be called the same number of times
that Freeze was before the window will be updated.
"""
return _core.Window_Thaw(*args, **kwargs)
@ -6453,16 +6475,16 @@ class Window(EvtHandler):
"""
return _core.Window_IsExposedPoint(*args, **kwargs)
def isExposedRect(*args, **kwargs):
def IsExposedRect(*args, **kwargs):
"""
isExposedRect(Rect rect) -> bool
IsExposedRect(Rect rect) -> bool
Returns true if the given point or rectangle area has been exposed
since the last repaint. Call this in an paint event handler to
optimize redrawing by only redrawing those areas, which have been
exposed.
"""
return _core.Window_isExposedRect(*args, **kwargs)
return _core.Window_IsExposedRect(*args, **kwargs)
def SetBackgroundColour(*args, **kwargs):
"""
@ -6545,7 +6567,7 @@ class Window(EvtHandler):
"""
GetFont() -> Font
Returns a reference to the font for this window.
Returns the default font used for this window.
"""
return _core.Window_GetFont(*args, **kwargs)
@ -7182,7 +7204,7 @@ def FindWindowByLabel(*args, **kwargs):
return _core.FindWindowByLabel(*args, **kwargs)
def Window_FromHWND(*args, **kwargs):
"""Window_FromHWND(unsigned long hWnd) -> Window"""
"""Window_FromHWND(Window parent, unsigned long _hWnd) -> Window"""
return _core.Window_FromHWND(*args, **kwargs)
#---------------------------------------------------------------------------
@ -9380,7 +9402,7 @@ def CallAfter(callable, *args, **kw):
class FutureCall:
"""
A convenience class for wxTimer, that calls the given callable
A convenience class for wx.Timer, that calls the given callable
object once after the given amount of milliseconds, passing any
positional or keyword args. The return value of the callable is
availbale after it has been run with the GetResult method.
@ -9397,6 +9419,7 @@ class FutureCall:
self.callable = callable
self.SetArgs(*args, **kwargs)
self.runCount = 0
self.running = False
self.hasRun = False
self.result = None
self.timer = None
@ -9418,6 +9441,7 @@ class FutureCall:
self.Stop()
self.timer = wx.PyTimer(self.Notify)
self.timer.Start(self.millis, wx.TIMER_ONE_SHOT)
self.running = True
Restart = Start
@ -9464,9 +9488,12 @@ class FutureCall:
"""
if self.callable and getattr(self.callable, 'im_self', True):
self.runCount += 1
self.running = False
self.result = self.callable(*self.args, **self.kwargs)
self.hasRun = True
wx.CallAfter(self.Stop)
if not self.running:
# if it wasn't restarted, then cleanup
wx.CallAfter(self.Stop)
#----------------------------------------------------------------------------

125
wxPython/src/msw/core_wrap.cpp
View File

@ -1373,11 +1373,23 @@ wxWindow* wxFindWindowByLabel( const wxString& label,
}
wxWindow* wxWindow_FromHWND(unsigned long hWnd) {
#ifdef __WXMSW__
#include <wx/msw/private.h> // to get wxGetWindowId
#endif
wxWindow* wxWindow_FromHWND(wxWindow* parent, unsigned long _hWnd) {
#ifdef __WXMSW__
WXHWND hWnd = (WXHWND)_hWnd;
long id = wxGetWindowId(hWnd);
wxWindow* win = new wxWindow;
win->SetHWND((WXHWND)hWnd);
win->SubclassWin((WXHWND)hWnd);
parent->AddChild(win);
win->SetEventHandler(win);
win->SetHWND(hWnd);
win->SetId(id);
win->SubclassWin(hWnd);
win->AdoptAttributesFromHWND();
win->SetupColours();
return win;
#else
wxPyRaiseNotImplemented();
@ -14988,7 +15000,10 @@ static PyObject *_wrap_SetCursorEvent_GetCursor(PyObject *self, PyObject *args,
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCursor, 0);
{
wxCursor* resultptr = new wxCursor(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxCursor, 1);
}
return resultobj;
fail:
return NULL;
@ -21334,6 +21349,61 @@ static PyObject *_wrap_Window_GetName(PyObject *self, PyObject *args, PyObject *
}
static PyObject *_wrap_Window_SetWindowVariant(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
int arg2 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "variant", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_SetWindowVariant",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (wxWindowVariant) SWIG_AsInt(obj1);
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->SetWindowVariant((wxWindowVariant )arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Window_GetWindowVariant(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
int result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_GetWindowVariant",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (int)((wxWindow const *)arg1)->GetWindowVariant();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_FromInt((int)result);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Window_SetId(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
@ -24719,7 +24789,7 @@ static PyObject *_wrap_Window_IsExposedPoint(PyObject *self, PyObject *args, PyO
}
static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_Window_IsExposedRect(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxWindow *arg1 = (wxWindow *) 0 ;
wxRect *arg2 = 0 ;
@ -24731,7 +24801,7 @@ static PyObject *_wrap_Window_isExposedRect(PyObject *self, PyObject *args, PyOb
(char *) "self",(char *) "rect", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_isExposedRect",kwnames,&obj0,&obj1)) goto fail;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_IsExposedRect",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
@ -24935,7 +25005,10 @@ static PyObject *_wrap_Window_GetCursor(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxCursor, 0);
{
wxCursor* resultptr = new wxCursor(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxCursor, 1);
}
return resultobj;
fail:
return NULL;
@ -24999,7 +25072,10 @@ static PyObject *_wrap_Window_GetFont(PyObject *self, PyObject *args, PyObject *
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
{
wxFont* resultptr = new wxFont(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxFont, 1);
}
return resultobj;
fail:
return NULL;
@ -26877,19 +26953,23 @@ static PyObject *_wrap_FindWindowByLabel(PyObject *self, PyObject *args, PyObjec
static PyObject *_wrap_Window_FromHWND(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
unsigned long arg1 ;
wxWindow *arg1 = (wxWindow *) 0 ;
unsigned long arg2 ;
wxWindow *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "hWnd", NULL
(char *) "parent",(char *) "_hWnd", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:Window_FromHWND",kwnames,&obj0)) goto fail;
arg1 = (unsigned long) SWIG_AsUnsignedLong(obj0);
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Window_FromHWND",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (unsigned long) SWIG_AsUnsignedLong(obj1);
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxWindow *)wxWindow_FromHWND(arg1);
result = (wxWindow *)wxWindow_FromHWND(arg1,arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
@ -31460,7 +31540,10 @@ static PyObject *_wrap_MenuItem_GetDisabledBitmap(PyObject *self, PyObject *args
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);
{
wxBitmap* resultptr = new wxBitmap(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
}
return resultobj;
fail:
return NULL;
@ -31682,7 +31765,10 @@ static PyObject *_wrap_MenuItem_GetBitmap(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);
{
wxBitmap* resultptr = new wxBitmap(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
}
return resultobj;
fail:
return NULL;
@ -39881,6 +39967,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_GetLabel", (PyCFunction) _wrap_Window_GetLabel, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_SetName", (PyCFunction) _wrap_Window_SetName, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_GetName", (PyCFunction) _wrap_Window_GetName, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_SetWindowVariant", (PyCFunction) _wrap_Window_SetWindowVariant, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_GetWindowVariant", (PyCFunction) _wrap_Window_GetWindowVariant, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_SetId", (PyCFunction) _wrap_Window_SetId, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_GetId", (PyCFunction) _wrap_Window_GetId, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_NewControlId", (PyCFunction) _wrap_Window_NewControlId, METH_VARARGS | METH_KEYWORDS },
@ -39991,7 +40079,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Window_GetUpdateClientRect", (PyCFunction) _wrap_Window_GetUpdateClientRect, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_IsExposed", (PyCFunction) _wrap_Window_IsExposed, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_IsExposedPoint", (PyCFunction) _wrap_Window_IsExposedPoint, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_isExposedRect", (PyCFunction) _wrap_Window_isExposedRect, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_IsExposedRect", (PyCFunction) _wrap_Window_IsExposedRect, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_SetBackgroundColour", (PyCFunction) _wrap_Window_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_SetForegroundColour", (PyCFunction) _wrap_Window_SetForegroundColour, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Window_GetBackgroundColour", (PyCFunction) _wrap_Window_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
@ -41927,6 +42015,11 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"PRINT_POSTSCRIPT", SWIG_FromInt((int)wxPRINT_POSTSCRIPT));
SWIG_addvarlink(SWIG_globals,(char*)"NullAcceleratorTable",_wrap_NullAcceleratorTable_get, _wrap_NullAcceleratorTable_set);
SWIG_addvarlink(SWIG_globals,(char*)"PanelNameStr",_wrap_PanelNameStr_get, _wrap_PanelNameStr_set);
PyDict_SetItemString(d,"WINDOW_VARIANT_DEFAULT", SWIG_FromInt((int)wxWINDOW_VARIANT_DEFAULT));
PyDict_SetItemString(d,"WINDOW_VARIANT_NORMAL", SWIG_FromInt((int)wxWINDOW_VARIANT_NORMAL));
PyDict_SetItemString(d,"WINDOW_VARIANT_SMALL", SWIG_FromInt((int)wxWINDOW_VARIANT_SMALL));
PyDict_SetItemString(d,"WINDOW_VARIANT_MINI", SWIG_FromInt((int)wxWINDOW_VARIANT_MINI));
PyDict_SetItemString(d,"WINDOW_VARIANT_LARGE", SWIG_FromInt((int)wxWINDOW_VARIANT_LARGE));
SWIG_addvarlink(SWIG_globals,(char*)"DefaultValidator",_wrap_DefaultValidator_get, _wrap_DefaultValidator_set);
SWIG_addvarlink(SWIG_globals,(char*)"ControlNameStr",_wrap_ControlNameStr_get, _wrap_ControlNameStr_set);
PyDict_SetItemString(d,"FLEX_GROWMODE_NONE", SWIG_FromInt((int)wxFLEX_GROWMODE_NONE));

8
wxPython/src/msw/gdi.py
View File

@ -603,6 +603,14 @@ class Bitmap(GDIObject):
return _gdi.Bitmap_SetQuality(*args, **kwargs)
def __nonzero__(self): return self.Ok()
def __eq__(*args, **kwargs):
"""__eq__(Bitmap other) -> bool"""
return _gdi.Bitmap___eq__(*args, **kwargs)
def __ne__(*args, **kwargs):
"""__ne__(Bitmap other) -> bool"""
return _gdi.Bitmap___ne__(*args, **kwargs)
class BitmapPtr(Bitmap):
def __init__(self, this):

89
wxPython/src/msw/gdi_wrap.cpp
View File

@ -610,6 +610,8 @@ void wxBitmap_SetMaskColour(wxBitmap *self,wxColour const &colour){
wxMask *mask = new wxMask(*self, colour);
self->SetMask(mask);
}
bool wxBitmap___eq__(wxBitmap *self,wxBitmap const *other){ return other ? (*self == *other) : False; }
bool wxBitmap___ne__(wxBitmap *self,wxBitmap const *other){ return other ? (*self != *other) : True; }
wxMask *new_wxMask(wxBitmap const &bitmap,wxColour const &colour){
if ( !colour.Ok() )
return new wxMask(bitmap, *wxBLACK);
@ -3603,6 +3605,66 @@ static PyObject *_wrap_Bitmap_SetQuality(PyObject *self, PyObject *args, PyObjec
}
static PyObject *_wrap_Bitmap___eq__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBitmap *arg1 = (wxBitmap *) 0 ;
wxBitmap *arg2 = (wxBitmap *) 0 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "other", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap___eq__",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxBitmap___eq__(arg1,(wxBitmap const *)arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Bitmap___ne__(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBitmap *arg1 = (wxBitmap *) 0 ;
wxBitmap *arg2 = (wxBitmap *) 0 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "other", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Bitmap___ne__",kwnames,&obj0,&obj1)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBitmap,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxBitmap,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)wxBitmap___ne__(arg1,(wxBitmap const *)arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
return resultobj;
fail:
return NULL;
}
static PyObject * Bitmap_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
@ -4674,7 +4736,10 @@ static PyObject *_wrap_IconBundle_GetIcon(PyObject *self, PyObject *args, PyObje
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxIcon, 0);
{
wxIcon* resultptr = new wxIcon(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxIcon, 1);
}
return resultobj;
fail:
return NULL;
@ -14049,7 +14114,10 @@ static PyObject *_wrap_DC_GetBackground(PyObject *self, PyObject *args, PyObject
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0);
{
wxBrush* resultptr = new wxBrush(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBrush, 1);
}
return resultobj;
fail:
return NULL;
@ -14078,7 +14146,10 @@ static PyObject *_wrap_DC_GetBrush(PyObject *self, PyObject *args, PyObject *kwa
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBrush, 0);
{
wxBrush* resultptr = new wxBrush(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBrush, 1);
}
return resultobj;
fail:
return NULL;
@ -14107,7 +14178,10 @@ static PyObject *_wrap_DC_GetFont(PyObject *self, PyObject *args, PyObject *kwar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxFont, 0);
{
wxFont* resultptr = new wxFont(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxFont, 1);
}
return resultobj;
fail:
return NULL;
@ -14136,7 +14210,10 @@ static PyObject *_wrap_DC_GetPen(PyObject *self, PyObject *args, PyObject *kwarg
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPen, 0);
{
wxPen* resultptr = new wxPen(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxPen, 1);
}
return resultobj;
fail:
return NULL;
@ -18726,6 +18803,8 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Bitmap_CopyFromCursor", (PyCFunction) _wrap_Bitmap_CopyFromCursor, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Bitmap_GetQuality", (PyCFunction) _wrap_Bitmap_GetQuality, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Bitmap_SetQuality", (PyCFunction) _wrap_Bitmap_SetQuality, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Bitmap___eq__", (PyCFunction) _wrap_Bitmap___eq__, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Bitmap___ne__", (PyCFunction) _wrap_Bitmap___ne__, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Bitmap_swigregister", Bitmap_swigregister, METH_VARARGS },
{ (char *)"new_Mask", (PyCFunction) _wrap_new_Mask, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Mask_swigregister", Mask_swigregister, METH_VARARGS },

6
wxPython/src/msw/grid.py
View File

@ -1226,7 +1226,7 @@ class Grid(windows.ScrolledWindow):
wxGridSelectColumns = _grid.Grid_wxGridSelectColumns
SelectCells = wxGridSelectCells
SelectRows = wxGridSelectRows
SelectColumns = wxGridSelectColumns,
SelectColumns = wxGridSelectColumns
def CreateGrid(*args, **kwargs):
"""CreateGrid(int numRows, int numCols, WXGRIDSELECTIONMODES selmode=wxGridSelectCells) -> bool"""
@ -1319,10 +1319,6 @@ class Grid(windows.ScrolledWindow):
"""ForceRefresh()"""
return _grid.Grid_ForceRefresh(*args, **kwargs)
def Refresh(*args, **kwargs):
"""Refresh(bool eraseb=True, Rect rect=None)"""
return _grid.Grid_Refresh(*args, **kwargs)
def IsEditable(*args, **kwargs):
"""IsEditable() -> bool"""
return _grid.Grid_IsEditable(*args, **kwargs)

38
wxPython/src/msw/grid_wrap.cpp
View File

@ -8820,43 +8820,6 @@ static PyObject *_wrap_Grid_ForceRefresh(PyObject *self, PyObject *args, PyObjec
}
static PyObject *_wrap_Grid_Refresh(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
bool arg2 = (bool) True ;
wxRect *arg3 = (wxRect *) NULL ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "eraseb",(char *) "rect", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|OO:Grid_Refresh",kwnames,&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxGrid,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj1) {
arg2 = (bool) SWIG_AsBool(obj1);
if (PyErr_Occurred()) SWIG_fail;
}
if (obj2) {
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxRect,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->Refresh(arg2,(wxRect const *)arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Grid_IsEditable(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxGrid *arg1 = (wxGrid *) 0 ;
@ -15539,7 +15502,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Grid_EndBatch", (PyCFunction) _wrap_Grid_EndBatch, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_GetBatchCount", (PyCFunction) _wrap_Grid_GetBatchCount, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_ForceRefresh", (PyCFunction) _wrap_Grid_ForceRefresh, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_Refresh", (PyCFunction) _wrap_Grid_Refresh, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_IsEditable", (PyCFunction) _wrap_Grid_IsEditable, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_EnableEditing", (PyCFunction) _wrap_Grid_EnableEditing, METH_VARARGS | METH_KEYWORDS },
{ (char *)"Grid_EnableCellEditControl", (PyCFunction) _wrap_Grid_EnableCellEditControl, METH_VARARGS | METH_KEYWORDS },

279
wxPython/src/msw/misc.py
View File

@ -948,7 +948,7 @@ class Timer(core.EvtHandler):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._setCallbackInfo(self, Timer)
self._setCallbackInfo(self, Timer, 0)
def __del__(self, destroy=_misc.delete_Timer):
"""__del__()"""
@ -957,7 +957,7 @@ class Timer(core.EvtHandler):
except: pass
def _setCallbackInfo(*args, **kwargs):
"""_setCallbackInfo(PyObject self, PyObject _class)"""
"""_setCallbackInfo(PyObject self, PyObject _class, int incref=1)"""
return _misc.Timer__setCallbackInfo(*args, **kwargs)
def SetOwner(*args, **kwargs):
@ -1008,7 +1008,7 @@ class PyTimer(Timer):
EVT_TIMER = wx.PyEventBinder( wxEVT_TIMER, 1 )
class TimerEvent(core.Event):
def __repr__(self):
@ -2484,18 +2484,19 @@ class ConfigBase(object):
class) and you will always use one of its derivations: wx.Config
or wx.FileConfig.
wx.ConfigBase organizes the items in a tree-like structure
(modeled after the Unix/Dos filesystem). There are groups
(directories) and keys (files). There is always one current
group given by the current path. As in the file system case, to
specify a key in the config class you must use a path to it.
Config classes also support the notion of the current group,
which makes it possible to use relative paths.
wx.ConfigBase organizes the items in a tree-like structure,
modeled after the Unix/Dos filesystem. There are groups that act
like directories and entries, key/value pairs that act like
files. There is always one current group given by the current
path. As in the file system case, to specify a key in the config
class you must use a path to it. Config classes also support the
notion of the current group, which makes it possible to use
relative paths.
Keys are pairs "key_name = value" where value may be of string, integer
floating point or boolean, you can not store binary data without first
encoding it as a string. For performance reasons items should be kept small,
no more than a couple kilobytes.
Keys are pairs "key_name = value" where value may be of string,
integer floating point or boolean, you can not store binary data
without first encoding it as a string. For performance reasons
items should be kept small, no more than a couple kilobytes.
"""
def __init__(self): raise RuntimeError, "No constructor defined"
@ -2926,7 +2927,7 @@ class FileConfig(ConfigBase):
"""
__init__(String appName=EmptyString, String vendorName=EmptyString,
String localFilename=EmptyString, String globalFilename=EmptyString,
long style=0) -> FileConfig
long style=wxCONFIG_USE_LOCAL_FILE|wxCONFIG_USE_GLOBAL_FILE) -> FileConfig
"""
newobj = _misc.new_FileConfig(*args, **kwargs)
self.this = newobj.this
@ -5022,4 +5023,252 @@ class ClipboardLockerPtr(ClipboardLocker):
_misc.ClipboardLocker_swigregister(ClipboardLockerPtr)
TheClipboard = cvar.TheClipboard
#---------------------------------------------------------------------------
class VideoMode(object):
"""A simple struct containing video mode parameters for a display"""
def __repr__(self):
return "<%s.%s; proxy of C++ wxVideoMode instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""
__init__(int width=0, int height=0, int depth=0, int freq=0) -> VideoMode
A simple struct containing video mode parameters for a display
"""
newobj = _misc.new_VideoMode(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_misc.delete_VideoMode):
"""__del__()"""
try:
if self.thisown: destroy(self)
except: pass
def Matches(*args, **kwargs):
"""
Matches(VideoMode other) -> bool
Returns true if this mode matches the other one in the sense that
all non zero fields of the other mode have the same value in this
one (except for refresh which is allowed to have a greater value)
"""
return _misc.VideoMode_Matches(*args, **kwargs)
def GetWidth(*args, **kwargs):
"""
GetWidth() -> int
Returns the screen width in pixels (e.g. 640*480), 0 means
unspecified
"""
return _misc.VideoMode_GetWidth(*args, **kwargs)
def GetHeight(*args, **kwargs):
"""
GetHeight() -> int
Returns the screen width in pixels (e.g. 640*480), 0 means
unspecified
"""
return _misc.VideoMode_GetHeight(*args, **kwargs)
def GetDepth(*args, **kwargs):
"""
GetDepth() -> int
Returns the screen's bits per pixel (e.g. 32), 1 is monochrome
and 0 means unspecified/known
"""
return _misc.VideoMode_GetDepth(*args, **kwargs)
def IsOk(*args, **kwargs):
"""
IsOk() -> bool
returns true if the object has been initialized
"""
return _misc.VideoMode_IsOk(*args, **kwargs)
def __nonzero__(self): return self.IsOk()
def __eq__(*args, **kwargs):
"""__eq__(VideoMode other) -> bool"""
return _misc.VideoMode___eq__(*args, **kwargs)
def __ne__(*args, **kwargs):
"""__ne__(VideoMode other) -> bool"""
return _misc.VideoMode___ne__(*args, **kwargs)
w = property(_misc.VideoMode_w_get, _misc.VideoMode_w_set)
h = property(_misc.VideoMode_h_get, _misc.VideoMode_h_set)
bpp = property(_misc.VideoMode_bpp_get, _misc.VideoMode_bpp_set)
refresh = property(_misc.VideoMode_refresh_get, _misc.VideoMode_refresh_set)
class VideoModePtr(VideoMode):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = VideoMode
_misc.VideoMode_swigregister(VideoModePtr)
class Display(object):
"""Represents a display/monitor attached to the system"""
def __repr__(self):
return "<%s.%s; proxy of C++ wxDisplay instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""
__init__(size_t index=0) -> Display
Set up a Display instance with the specified display. The
displays are numbered from 0 to GetCount() - 1, 0 is always the
primary display and the only one which is always supported
"""
newobj = _misc.new_Display(*args, **kwargs)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_misc.delete_Display):
"""__del__()"""
try:
if self.thisown: destroy(self)
except: pass
def GetCount(*args, **kwargs):
"""
GetCount() -> size_t
Return the number of available displays.
"""
return _misc.Display_GetCount(*args, **kwargs)
GetCount = staticmethod(GetCount)
def GetFromPoint(*args, **kwargs):
"""
GetFromPoint(Point pt) -> int
Find the display where the given point lies, return wx.NOT_FOUND
if it doesn't belong to any display
"""
return _misc.Display_GetFromPoint(*args, **kwargs)
GetFromPoint = staticmethod(GetFromPoint)
def GetFromWindow(*args, **kwargs):
"""
GetFromWindow(Window window) -> int
Find the display where the given window lies, return wx.NOT_FOUND
if it is not shown at all.
"""
return _misc.Display_GetFromWindow(*args, **kwargs)
GetFromWindow = staticmethod(GetFromWindow)
def IsOk(*args, **kwargs):
"""
IsOk() -> bool
Return true if the object was initialized successfully
"""
return _misc.Display_IsOk(*args, **kwargs)
def __nonzero__(self): return self.IsOk()
def GetGeometry(*args, **kwargs):
"""
GetGeometry() -> Rect
Returns the bounding rectangle of the display whose index was
passed to the constructor.
"""
return _misc.Display_GetGeometry(*args, **kwargs)
def GetName(*args, **kwargs):
"""
GetName() -> String
Returns the display's name. A name is not available on all platforms.
"""
return _misc.Display_GetName(*args, **kwargs)
def IsPrimary(*args, **kwargs):
"""
IsPrimary() -> bool
Returns true if the display is the primary display. The primary
display is the one whose index is 0.
"""
return _misc.Display_IsPrimary(*args, **kwargs)
def GetModes(*args, **kwargs):
"""
GetModes(VideoMode mode=DefaultVideoMode) -> [videoMode...]
Enumerate all video modes supported by this display matching the
given one (in the sense of VideoMode.Match()).
As any mode matches the default value of the argument and there
is always at least one video mode supported by display, the
returned array is only empty for the default value of the
argument if this function is not supported at all on this
platform.
"""
return _misc.Display_GetModes(*args, **kwargs)
def GetCurrentMode(*args, **kwargs):
"""
GetCurrentMode() -> VideoMode
Get the current video mode.
"""
return _misc.Display_GetCurrentMode(*args, **kwargs)
def ChangeMode(*args, **kwargs):
"""
ChangeMode(VideoMode mode=DefaultVideoMode) -> bool
Change current mode, return true if succeeded, false otherwise
"""
return _misc.Display_ChangeMode(*args, **kwargs)
def ResetMode(*args, **kwargs):
"""
ResetMode()
Restore the default video mode (just a more readable synonym)
"""
return _misc.Display_ResetMode(*args, **kwargs)
class DisplayPtr(Display):
def __init__(self, this):
self.this = this
if not hasattr(self,"thisown"): self.thisown = 0
self.__class__ = Display
_misc.Display_swigregister(DisplayPtr)
DefaultVideoMode = cvar.DefaultVideoMode
def Display_GetCount(*args, **kwargs):
"""
Display_GetCount() -> size_t
Return the number of available displays.
"""
return _misc.Display_GetCount(*args, **kwargs)
def Display_GetFromPoint(*args, **kwargs):
"""
Display_GetFromPoint(Point pt) -> int
Find the display where the given point lies, return wx.NOT_FOUND
if it doesn't belong to any display
"""
return _misc.Display_GetFromPoint(*args, **kwargs)
def Display_GetFromWindow(*args, **kwargs):
"""
Display_GetFromWindow(Window window) -> int
Find the display where the given window lies, return wx.NOT_FOUND
if it is not shown at all.
"""
return _misc.Display_GetFromWindow(*args, **kwargs)

1094
wxPython/src/msw/misc_wrap.cpp
View File

File diff suppressed because it is too large Load Diff

83
wxPython/src/msw/windows.py
View File

@ -27,6 +27,8 @@ class Panel(core.Window):
Create(Window parent, int id, Point pos=DefaultPosition, Size size=DefaultSize,
long style=wxTAB_TRAVERSAL|wxNO_BORDER,
String name=PanelNameStr) -> bool
Create the GUI part of the Window for 2-phase creation mode.
"""
return _windows.Panel_Create(*args, **kwargs)
@ -70,6 +72,8 @@ class ScrolledWindow(Panel):
Create(Window parent, int id=-1, Point pos=DefaultPosition,
Size size=DefaultSize, long style=wxHSCROLL|wxVSCROLL,
String name=PanelNameStr) -> bool
Create the GUI part of the Window for 2-phase creation mode.
"""
return _windows.ScrolledWindow_Create(*args, **kwargs)
@ -238,11 +242,19 @@ class TopLevelWindow(core.Window):
return _windows.TopLevelWindow_IsFullScreen(*args, **kwargs)
def SetTitle(*args, **kwargs):
"""SetTitle(String title)"""
"""
SetTitle(String title)
Sets the window's title. Applicable only to frames and dialogs.
"""
return _windows.TopLevelWindow_SetTitle(*args, **kwargs)
def GetTitle(*args, **kwargs):
"""GetTitle() -> String"""
"""
GetTitle() -> String
Gets the window's title. Applicable only to frames and dialogs.
"""
return _windows.TopLevelWindow_GetTitle(*args, **kwargs)
def SetShape(*args, **kwargs):
@ -288,7 +300,13 @@ class Frame(TopLevelWindow):
return _windows.Frame_Create(*args, **kwargs)
def GetClientAreaOrigin(*args, **kwargs):
"""GetClientAreaOrigin() -> Point"""
"""
GetClientAreaOrigin() -> Point
Get the origin of the client area of the window relative to the
window's top left corner (the client area may be shifted because of
the borders, scrollbars, other decorations...)
"""
return _windows.Frame_GetClientAreaOrigin(*args, **kwargs)
def SendSizeEvent(*args, **kwargs):
@ -646,6 +664,7 @@ SP_PERMIT_UNSPLIT = _windows.SP_PERMIT_UNSPLIT
SP_LIVE_UPDATE = _windows.SP_LIVE_UPDATE
SP_3DSASH = _windows.SP_3DSASH
SP_3DBORDER = _windows.SP_3DBORDER
SP_NO_XP_THEME = _windows.SP_NO_XP_THEME
SP_BORDER = _windows.SP_BORDER
SP_3D = _windows.SP_3D
SPLIT_HORIZONTAL = _windows.SPLIT_HORIZONTAL
@ -1340,11 +1359,25 @@ class VScrolledWindow(Panel):
return _windows.VScrolledWindow_ScrollToLine(*args, **kwargs)
def ScrollLines(*args, **kwargs):
"""ScrollLines(int lines) -> bool"""
"""
ScrollLines(int lines) -> bool
If the platform and window class supports it, scrolls the window by
the given number of lines down, if lines is positive, or up if lines
is negative. Returns True if the window was scrolled, False if it was
already on top/bottom and nothing was done.
"""
return _windows.VScrolledWindow_ScrollLines(*args, **kwargs)
def ScrollPages(*args, **kwargs):
"""ScrollPages(int pages) -> bool"""
"""
ScrollPages(int pages) -> bool
If the platform and window class supports it, scrolls the window by
the given number of pages down, if pages is positive, or up if pages
is negative. Returns True if the window was scrolled, False if it was
already on top/bottom and nothing was done.
"""
return _windows.VScrolledWindow_ScrollPages(*args, **kwargs)
def RefreshLine(*args, **kwargs):
@ -1356,11 +1389,19 @@ class VScrolledWindow(Panel):
return _windows.VScrolledWindow_RefreshLines(*args, **kwargs)
def HitTestXT(*args, **kwargs):
"""HitTestXT(int x, int y) -> int"""
"""
HitTestXT(int x, int y) -> int
Test where the given (in client coords) point lies
"""
return _windows.VScrolledWindow_HitTestXT(*args, **kwargs)
def HitTest(*args, **kwargs):
"""HitTest(Point pt) -> int"""
"""
HitTest(Point pt) -> int
Test where the given (in client coords) point lies
"""
return _windows.VScrolledWindow_HitTest(*args, **kwargs)
def RefreshAll(*args, **kwargs):
@ -1589,6 +1630,7 @@ class TaskBarIcon(core.EvtHandler):
"""IsOk() -> bool"""
return _windows.TaskBarIcon_IsOk(*args, **kwargs)
def __nonzero__(self): return self.IsOk()
def IsIconInstalled(*args, **kwargs):
"""IsIconInstalled() -> bool"""
return _windows.TaskBarIcon_IsIconInstalled(*args, **kwargs)
@ -3388,9 +3430,12 @@ _windows.PageSetupDialog_swigregister(PageSetupDialogPtr)
class PrintDialogData(core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPrintDialogData instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__() -> PrintDialogData"""
newobj = _windows.new_PrintDialogData(*args, **kwargs)
def __init__(self, *args):
"""
__init__() -> PrintDialogData
__init__(PrintData printData) -> PrintDialogData
"""
newobj = _windows.new_PrintDialogData(*args)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
@ -3866,9 +3911,12 @@ _windows.PreviewControlBar_swigregister(PreviewControlBarPtr)
class PrintPreview(core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -> PrintPreview"""
newobj = _windows.new_PrintPreview(*args, **kwargs)
def __init__(self, *args):
"""
__init__(Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PrintPreview
__init__(Printout printout, Printout printoutForPrinting, PrintData data) -> PrintPreview
"""
newobj = _windows.new_PrintPreview(*args)
self.this = newobj.this
self.thisown = 1
del newobj.thisown
@ -3972,9 +4020,12 @@ _windows.PrintPreview_swigregister(PrintPreviewPtr)
class PyPrintPreview(PrintPreview):
def __repr__(self):
return "<%s.%s; proxy of C++ wxPyPrintPreview instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
"""__init__(Printout printout, Printout printoutForPrinting, PrintData data=None) -> PyPrintPreview"""
newobj = _windows.new_PyPrintPreview(*args, **kwargs)
def __init__(self, *args):
"""
__init__(Printout printout, Printout printoutForPrinting, PrintDialogData data=None) -> PyPrintPreview
__init__(Printout printout, Printout printoutForPrinting, PrintData data) -> PyPrintPreview
"""
newobj = _windows.new_PyPrintPreview(*args)
self.this = newobj.this
self.thisown = 1
del newobj.thisown

359
wxPython/src/msw/windows_wrap.cpp
View File

@ -882,6 +882,8 @@ public:
DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
PYPRIVATE;
};
@ -911,6 +913,7 @@ IMP_PYCALLBACK_SIZE_const(wxPyWindow, wxWindow, GetMaxSize);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, AddChild);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyWindow, wxWindow, RemoveChild);
IMP_PYCALLBACK_BOOL_(wxPyWindow, wxWindow, ShouldInheritColours);
// C++ version of Python aware wxPanel
class wxPyPanel : public wxPanel
@ -950,6 +953,8 @@ public:
DEC_PYCALLBACK_VOID_WXWINBASE(AddChild);
DEC_PYCALLBACK_VOID_WXWINBASE(RemoveChild);
DEC_PYCALLBACK_BOOL_(ShouldInheritColours);
PYPRIVATE;
};
@ -979,6 +984,7 @@ IMP_PYCALLBACK_SIZE_const(wxPyPanel, wxPanel, GetMaxSize);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, AddChild);
IMP_PYCALLBACK_VOID_WXWINBASE(wxPyPanel, wxPanel, RemoveChild);
IMP_PYCALLBACK_BOOL_(wxPyPanel, wxPanel, ShouldInheritColours);
#include "wx/wxPython/printfw.h"
@ -1080,6 +1086,11 @@ class wxPyPrintPreview : public wxPrintPreview
{
DECLARE_CLASS(wxPyPrintPreview)
public:
wxPyPrintPreview(wxPyPrintout* printout,
wxPyPrintout* printoutForPrinting,
wxPrintDialogData* data=NULL)
: wxPrintPreview(printout, printoutForPrinting, data)
{}
wxPyPrintPreview(wxPyPrintout* printout,
wxPyPrintout* printoutForPrinting,
wxPrintData* data=NULL)
@ -4579,7 +4590,10 @@ static PyObject *_wrap_SplashScreenWindow_GetBitmap(PyObject *self, PyObject *ar
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxBitmap, 0);
{
wxBitmap* resultptr = new wxBitmap(*result);
resultobj = SWIG_NewPointerObj((void*)(resultptr), SWIGTYPE_p_wxBitmap, 1);
}
return resultobj;
fail:
return NULL;
@ -18713,14 +18727,11 @@ static PyObject * PageSetupDialog_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_new_PrintDialogData__SWIG_0(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxPrintDialogData *result;
char *kwnames[] = {
NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":new_PrintDialogData",kwnames)) goto fail;
if(!PyArg_ParseTuple(args,(char *)":new_PrintDialogData")) goto fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPrintDialogData *)new wxPrintDialogData();
@ -18735,6 +18746,67 @@ static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args, PyObj
}
static PyObject *_wrap_new_PrintDialogData__SWIG_1(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxPrintData *arg1 = 0 ;
wxPrintDialogData *result;
PyObject * obj0 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"O:new_PrintDialogData",&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPrintData,
SWIG_POINTER_EXCEPTION | 0)) == -1)
SWIG_fail;
if (arg1 == NULL) {
PyErr_SetString(PyExc_TypeError,"null reference");
SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPrintDialogData *)new wxPrintDialogData((wxPrintData const &)*arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrintDialogData, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_PrintDialogData(PyObject *self, PyObject *args) {
int argc;
PyObject *argv[2];
int ii;
argc = PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 1); ii++) {
argv[ii] = PyTuple_GetItem(args,ii);
}
if (argc == 0) {
return _wrap_new_PrintDialogData__SWIG_0(self,args);
}
if (argc == 1) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPrintData, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_PrintDialogData__SWIG_1(self,args);
}
}
PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_PrintDialogData'");
return NULL;
}
static PyObject *_wrap_delete_PrintDialogData(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPrintDialogData *arg1 = (wxPrintDialogData *) 0 ;
@ -21372,26 +21444,23 @@ static PyObject * PreviewControlBar_swigregister(PyObject *self, PyObject *args)
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_new_PrintPreview__SWIG_0(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
wxPrintData *arg3 = (wxPrintData *) NULL ;
wxPrintDialogData *arg3 = (wxPrintDialogData *) NULL ;
wxPrintPreview *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char *kwnames[] = {
(char *) "printout",(char *) "printoutForPrinting",(char *) "data", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_PrintPreview",kwnames,&obj0,&obj1,&obj2)) goto fail;
if(!PyArg_ParseTuple(args,(char *)"OO|O:new_PrintPreview",&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj2) {
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPrintData,
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPrintDialogData,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
}
{
@ -21408,6 +21477,129 @@ static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args, PyObject
}
static PyObject *_wrap_new_PrintPreview__SWIG_1(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
wxPrintData *arg3 = (wxPrintData *) 0 ;
wxPrintPreview *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"OOO:new_PrintPreview",&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPrintData,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPrintPreview *)new wxPrintPreview(arg1,arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPrintPreview, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_PrintPreview(PyObject *self, PyObject *args) {
int argc;
PyObject *argv[4];
int ii;
argc = PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GetItem(args,ii);
}
if ((argc >= 2) && (argc <= 3)) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
if (argc <= 2) {
return _wrap_new_PrintPreview__SWIG_0(self,args);
}
{
void *ptr;
if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_PrintPreview__SWIG_0(self,args);
}
}
}
}
if (argc == 3) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintData, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_PrintPreview__SWIG_1(self,args);
}
}
}
}
PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_PrintPreview'");
return NULL;
}
static PyObject *_wrap_PrintPreview_SetCurrentPage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPrintPreview *arg1 = (wxPrintPreview *) 0 ;
@ -22051,26 +22243,23 @@ static PyObject * PrintPreview_swigregister(PyObject *self, PyObject *args) {
Py_INCREF(obj);
return Py_BuildValue((char *)"");
}
static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args, PyObject *kwargs) {
static PyObject *_wrap_new_PyPrintPreview__SWIG_0(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
wxPrintData *arg3 = (wxPrintData *) NULL ;
wxPrintDialogData *arg3 = (wxPrintDialogData *) NULL ;
wxPyPrintPreview *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char *kwnames[] = {
(char *) "printout",(char *) "printoutForPrinting",(char *) "data", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:new_PyPrintPreview",kwnames,&obj0,&obj1,&obj2)) goto fail;
if(!PyArg_ParseTuple(args,(char *)"OO|O:new_PyPrintPreview",&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if (obj2) {
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPrintData,
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPrintDialogData,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
}
{
@ -22087,6 +22276,129 @@ static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args, PyObje
}
static PyObject *_wrap_new_PyPrintPreview__SWIG_1(PyObject *self, PyObject *args) {
PyObject *resultobj;
wxPyPrintout *arg1 = (wxPyPrintout *) 0 ;
wxPyPrintout *arg2 = (wxPyPrintout *) 0 ;
wxPrintData *arg3 = (wxPrintData *) 0 ;
wxPyPrintPreview *result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
if(!PyArg_ParseTuple(args,(char *)"OOO:new_PyPrintPreview",&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxPyPrintout,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj2,(void **)(&arg3),SWIGTYPE_p_wxPrintData,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxPyPrintPreview *)new wxPyPrintPreview(arg1,arg2,arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
resultobj = SWIG_NewPointerObj((void*)(result), SWIGTYPE_p_wxPyPrintPreview, 1);
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_new_PyPrintPreview(PyObject *self, PyObject *args) {
int argc;
PyObject *argv[4];
int ii;
argc = PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GetItem(args,ii);
}
if ((argc >= 2) && (argc <= 3)) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
if (argc <= 2) {
return _wrap_new_PyPrintPreview__SWIG_0(self,args);
}
{
void *ptr;
if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintDialogData, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_PyPrintPreview__SWIG_0(self,args);
}
}
}
}
if (argc == 3) {
int _v;
{
void *ptr;
if (SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_wxPyPrintout, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
{
void *ptr;
if (SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_wxPrintData, 0) == -1) {
_v = 0;
PyErr_Clear();
} else {
_v = 1;
}
}
if (_v) {
return _wrap_new_PyPrintPreview__SWIG_1(self,args);
}
}
}
}
PyErr_SetString(PyExc_TypeError,"No matching function for overloaded 'new_PyPrintPreview'");
return NULL;
}
static PyObject *_wrap_PyPrintPreview__setCallbackInfo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyPrintPreview *arg1 = (wxPyPrintPreview *) 0 ;
@ -23337,7 +23649,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PageSetupDialog_GetPageSetupData", (PyCFunction) _wrap_PageSetupDialog_GetPageSetupData, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PageSetupDialog_ShowModal", (PyCFunction) _wrap_PageSetupDialog_ShowModal, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PageSetupDialog_swigregister", PageSetupDialog_swigregister, METH_VARARGS },
{ (char *)"new_PrintDialogData", (PyCFunction) _wrap_new_PrintDialogData, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_PrintDialogData", _wrap_new_PrintDialogData, METH_VARARGS },
{ (char *)"delete_PrintDialogData", (PyCFunction) _wrap_delete_PrintDialogData, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PrintDialogData_GetFromPage", (PyCFunction) _wrap_PrintDialogData_GetFromPage, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PrintDialogData_GetToPage", (PyCFunction) _wrap_PrintDialogData_GetToPage, METH_VARARGS | METH_KEYWORDS },
@ -23428,7 +23740,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PreviewControlBar_OnLast", (PyCFunction) _wrap_PreviewControlBar_OnLast, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PreviewControlBar_OnGoto", (PyCFunction) _wrap_PreviewControlBar_OnGoto, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PreviewControlBar_swigregister", PreviewControlBar_swigregister, METH_VARARGS },
{ (char *)"new_PrintPreview", (PyCFunction) _wrap_new_PrintPreview, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_PrintPreview", _wrap_new_PrintPreview, METH_VARARGS },
{ (char *)"PrintPreview_SetCurrentPage", (PyCFunction) _wrap_PrintPreview_SetCurrentPage, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PrintPreview_GetCurrentPage", (PyCFunction) _wrap_PrintPreview_GetCurrentPage, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PrintPreview_SetPrintout", (PyCFunction) _wrap_PrintPreview_SetPrintout, METH_VARARGS | METH_KEYWORDS },
@ -23452,7 +23764,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"PrintPreview_Print", (PyCFunction) _wrap_PrintPreview_Print, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PrintPreview_DetermineScaling", (PyCFunction) _wrap_PrintPreview_DetermineScaling, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PrintPreview_swigregister", PrintPreview_swigregister, METH_VARARGS },
{ (char *)"new_PyPrintPreview", (PyCFunction) _wrap_new_PyPrintPreview, METH_VARARGS | METH_KEYWORDS },
{ (char *)"new_PyPrintPreview", _wrap_new_PyPrintPreview, METH_VARARGS },
{ (char *)"PyPrintPreview__setCallbackInfo", (PyCFunction) _wrap_PyPrintPreview__setCallbackInfo, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyPrintPreview_base_SetCurrentPage", (PyCFunction) _wrap_PyPrintPreview_base_SetCurrentPage, METH_VARARGS | METH_KEYWORDS },
{ (char *)"PyPrintPreview_base_PaintPage", (PyCFunction) _wrap_PyPrintPreview_base_PaintPage, METH_VARARGS | METH_KEYWORDS },
@ -24708,6 +25020,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"SP_LIVE_UPDATE", SWIG_FromInt((int)wxSP_LIVE_UPDATE));
PyDict_SetItemString(d,"SP_3DSASH", SWIG_FromInt((int)wxSP_3DSASH));
PyDict_SetItemString(d,"SP_3DBORDER", SWIG_FromInt((int)wxSP_3DBORDER));
PyDict_SetItemString(d,"SP_NO_XP_THEME", SWIG_FromInt((int)wxSP_NO_XP_THEME));
PyDict_SetItemString(d,"SP_BORDER", SWIG_FromInt((int)wxSP_BORDER));
PyDict_SetItemString(d,"SP_3D", SWIG_FromInt((int)wxSP_3D));
PyDict_SetItemString(d,"SPLIT_HORIZONTAL", SWIG_FromInt((int)wxSPLIT_HORIZONTAL));