Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wxPython 2.1b1:

Browse Source 
Added the missing wxWindow.GetUpdateRegion() method.

	Made a new change in SWIG (update your patches everybody) that
	provides a fix for global shadow objects that get an exception in
	their __del__ when their extension module has already been deleted.
	It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
	line 496 if you want to do it by hand.

	It is now possible to run through MainLoop more than once in any one
	process.  The cleanup that used to happen as MainLoop completed (and
	prevented it from running again) has been delayed until the wxc module
	is being unloaded by Python.

	wxWindow.PopupMenu() now takes a wxPoint instead of  x,y.  Added
	wxWindow.PopupMenuXY to be consistent with some other methods.

	Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.

	You can now provide your own app.MainLoop method.  See
	wxPython/demo/demoMainLoop.py for an example and some explaination.

	Got the in-place-edit for the wxTreeCtrl fixed and added some demo
	code to show how to use it.

	Put the wxIcon constructor back in for GTK as it now has one that
	matches MSW's.

	Added wxGrid.GetCells

	Added wxSystemSettings static methods as functions with names like
	wxSystemSettings_GetSystemColour.

	Removed wxPyMenu since using menu callbacks have been depreciated in
	wxWindows.  Use wxMenu and events instead.

	Added alternate wxBitmap constructor (for MSW only) as
	      wxBitmapFromData(data, type, width, height, depth = 1)

	Added a helper function named wxPyTypeCast that can convert shadow
	objects of one type into shadow objects of another type.  (Like doing
	a down-cast.)  See the implementation in wx.py for some docs.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3223 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-07-31 07:56:15 +00:00
parent f91cd38969
commit 8bf5d46efb
123 changed files with 12610 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
utils/wxPython/src/msw/cmndlgs.cpp
View File

@@ -2515,7 +2515,6 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
@@ -2586,6 +2585,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
@@ -2618,6 +2618,7 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -2741,7 +2742,6 @@ SWIGEXPORT(void,initcmndlgsc)() {
SWIG_RegisterMapping("_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog);
SWIG_RegisterMapping("_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);

4
utils/wxPython/src/msw/cmndlgs.py
View File

@@ -19,7 +19,7 @@ class wxColourDataPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, cmndlgsc=cmndlgsc):
if self.thisown == 1 :
cmndlgsc.delete_wxColourData(self.this)
def GetChooseFull(self):
@@ -243,7 +243,7 @@ class wxFontDataPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, cmndlgsc=cmndlgsc):
if self.thisown == 1 :
cmndlgsc.delete_wxFontData(self.this)
def EnableEffects(self,arg0):

123
utils/wxPython/src/msw/controls.cpp
View File

@@ -57,6 +57,7 @@ extern PyObject *SWIG_newvarlink(void);
#include <wx/slider.h>
#include <wx/spinbutt.h>
#include <wx/dynarray.h>
#include <wx/statline.h>
#ifdef __WXMSW__
#if wxUSE_OWNER_DRAWN
@@ -66,7 +67,6 @@ extern PyObject *SWIG_newvarlink(void);
#ifdef __WXGTK__
#include <wx/checklst.h>
#include <wx/statline.h>
#endif
@@ -2321,6 +2321,76 @@ static PyObject *_wrap_new_wxStaticBox(PyObject *self, PyObject *args) {
return _resultobj;
}
static void *SwigwxStaticLineTowxControl(void *ptr) {
wxStaticLine *src;
wxControl *dest;
src = (wxStaticLine *) ptr;
dest = (wxControl *) src;
return (void *) dest;
}
static void *SwigwxStaticLineTowxWindow(void *ptr) {
wxStaticLine *src;
wxWindow *dest;
src = (wxStaticLine *) ptr;
dest = (wxWindow *) src;
return (void *) dest;
}
static void *SwigwxStaticLineTowxEvtHandler(void *ptr) {
wxStaticLine *src;
wxEvtHandler *dest;
src = (wxStaticLine *) ptr;
dest = (wxEvtHandler *) src;
return (void *) dest;
}
#define new_wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStaticLine(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxStaticLine(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxStaticLine * _result;
wxWindow * _arg0;
wxWindowID _arg1;
wxPoint * _arg2 = &wxPyDefaultPosition;
wxSize * _arg3 = &wxPyDefaultSize;
long _arg4 = wxLI_HORIZONTAL;
char * _arg5 = "staticLine";
char * _argc0 = 0;
char * _argc2 = 0;
char * _argc3 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"si|ssls:new_wxStaticLine",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxStaticLine. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc2) {
if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxStaticLine. Expected _wxPoint_p.");
return NULL;
}
}
if (_argc3) {
if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxStaticLine. Expected _wxSize_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxStaticLine *)new_wxStaticLine(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5);
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (char *) _result,"_wxStaticLine_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static void *SwigwxStaticTextTowxControl(void *ptr) {
wxStaticText *src;
wxControl *dest;
@@ -4923,6 +4993,39 @@ static PyObject *_wrap_wxStaticBitmap_SetBitmap(PyObject *self, PyObject *args)
return _resultobj;
}
#define wxStaticBitmap_SetIcon(_swigobj,_swigarg0) (_swigobj->SetIcon(_swigarg0))
static PyObject *_wrap_wxStaticBitmap_SetIcon(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxStaticBitmap * _arg0;
wxIcon * _arg1;
char * _argc0 = 0;
char * _argc1 = 0;
self = self;
if(!PyArg_ParseTuple(args,"ss:wxStaticBitmap_SetIcon",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxStaticBitmap_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStaticBitmap_SetIcon. Expected _wxStaticBitmap_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxStaticBitmap_SetIcon. Expected _wxIcon_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxStaticBitmap_SetIcon(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxRadioBoxTowxControl(void *ptr) {
wxRadioBox *src;
wxControl *dest;
@@ -6182,6 +6285,7 @@ static PyMethodDef controlscMethods[] = {
{ "wxRadioBox_EnableItem", _wrap_wxRadioBox_EnableItem, 1 },
{ "wxRadioBox_Enable", _wrap_wxRadioBox_Enable, 1 },
{ "new_wxRadioBox", _wrap_new_wxRadioBox, 1 },
{ "wxStaticBitmap_SetIcon", _wrap_wxStaticBitmap_SetIcon, 1 },
{ "wxStaticBitmap_SetBitmap", _wrap_wxStaticBitmap_SetBitmap, 1 },
{ "wxStaticBitmap_GetBitmap", _wrap_wxStaticBitmap_GetBitmap, 1 },
{ "new_wxStaticBitmap", _wrap_new_wxStaticBitmap, 1 },
@@ -6257,6 +6361,7 @@ static PyMethodDef controlscMethods[] = {
{ "wxStaticText_SetLabel", _wrap_wxStaticText_SetLabel, 1 },
{ "wxStaticText_GetLabel", _wrap_wxStaticText_GetLabel, 1 },
{ "new_wxStaticText", _wrap_new_wxStaticText, 1 },
{ "new_wxStaticLine", _wrap_new_wxStaticLine, 1 },
{ "new_wxStaticBox", _wrap_new_wxStaticBox, 1 },
{ "wxGauge_SetValue", _wrap_wxGauge_SetValue, 1 },
{ "wxGauge_SetShadowWidth", _wrap_wxGauge_SetShadowWidth, 1 },
@@ -6366,6 +6471,8 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticText",SwigwxStaticTextTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxGauge",SwigwxGaugeTowxEvtHandler);
@@ -6388,7 +6495,6 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -6428,6 +6534,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
@@ -6455,6 +6562,7 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -6517,6 +6625,8 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxWindow","_wxListBox",SwigwxListBoxTowxWindow);
SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow);
SWIG_RegisterMapping("_class_wxWindow","_wxStaticText",SwigwxStaticTextTowxWindow);
SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticLine",SwigwxStaticLineTowxWindow);
SWIG_RegisterMapping("_class_wxWindow","_wxStaticLine",SwigwxStaticLineTowxWindow);
SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticBox",SwigwxStaticBoxTowxWindow);
SWIG_RegisterMapping("_class_wxWindow","_wxStaticBox",SwigwxStaticBoxTowxWindow);
SWIG_RegisterMapping("_class_wxWindow","_class_wxGauge",SwigwxGaugeTowxWindow);
@@ -6576,6 +6686,8 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_wxControl","_wxListBox",SwigwxListBoxTowxControl);
SWIG_RegisterMapping("_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl);
SWIG_RegisterMapping("_wxControl","_wxStaticText",SwigwxStaticTextTowxControl);
SWIG_RegisterMapping("_wxControl","_class_wxStaticLine",SwigwxStaticLineTowxControl);
SWIG_RegisterMapping("_wxControl","_wxStaticLine",SwigwxStaticLineTowxControl);
SWIG_RegisterMapping("_wxControl","_class_wxStaticBox",SwigwxStaticBoxTowxControl);
SWIG_RegisterMapping("_wxControl","_wxStaticBox",SwigwxStaticBoxTowxControl);
SWIG_RegisterMapping("_wxControl","_class_wxGauge",SwigwxGaugeTowxControl);
@@ -6601,7 +6713,6 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);
@@ -6664,6 +6775,8 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_class_wxControl","_wxListBox",SwigwxListBoxTowxControl);
SWIG_RegisterMapping("_class_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl);
SWIG_RegisterMapping("_class_wxControl","_wxStaticText",SwigwxStaticTextTowxControl);
SWIG_RegisterMapping("_class_wxControl","_class_wxStaticLine",SwigwxStaticLineTowxControl);
SWIG_RegisterMapping("_class_wxControl","_wxStaticLine",SwigwxStaticLineTowxControl);
SWIG_RegisterMapping("_class_wxControl","_class_wxStaticBox",SwigwxStaticBoxTowxControl);
SWIG_RegisterMapping("_class_wxControl","_wxStaticBox",SwigwxStaticBoxTowxControl);
SWIG_RegisterMapping("_class_wxControl","_class_wxGauge",SwigwxGaugeTowxControl);
@@ -6719,6 +6832,8 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_wxStaticText",SwigwxStaticTextTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_wxStaticLine",SwigwxStaticLineTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_wxStaticBox",SwigwxStaticBoxTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxGauge",SwigwxGaugeTowxEvtHandler);
@@ -6765,6 +6880,8 @@ SWIGEXPORT(void,initcontrolsc)() {
SWIG_RegisterMapping("_wxWindow","_wxListBox",SwigwxListBoxTowxWindow);
SWIG_RegisterMapping("_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxStaticText",SwigwxStaticTextTowxWindow);
SWIG_RegisterMapping("_wxWindow","_class_wxStaticLine",SwigwxStaticLineTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxStaticLine",SwigwxStaticLineTowxWindow);
SWIG_RegisterMapping("_wxWindow","_class_wxStaticBox",SwigwxStaticBoxTowxWindow);
SWIG_RegisterMapping("_wxWindow","_wxStaticBox",SwigwxStaticBoxTowxWindow);
SWIG_RegisterMapping("_wxWindow","_class_wxGauge",SwigwxGaugeTowxWindow);

23
utils/wxPython/src/msw/controls.py
View File

@@ -331,6 +331,26 @@ class wxStaticBox(wxStaticBoxPtr):
class wxStaticLinePtr(wxControlPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxStaticLine instance>"
class wxStaticLine(wxStaticLinePtr):
def __init__(self,arg0,arg1,*args) :
argl = map(None,args)
try: argl[0] = argl[0].this
except: pass
try: argl[1] = argl[1].this
except: pass
args = tuple(argl)
self.this = apply(controlsc.new_wxStaticLine,(arg0.this,arg1,)+args)
self.thisown = 1
class wxStaticTextPtr(wxControlPtr):
def __init__(self,this):
self.this = this
@@ -665,6 +685,9 @@ class wxStaticBitmapPtr(wxControlPtr):
def SetBitmap(self,arg0):
val = controlsc.wxStaticBitmap_SetBitmap(self.this,arg0.this)
return val
def SetIcon(self,arg0):
val = controlsc.wxStaticBitmap_SetIcon(self.this,arg0.this)
return val
def __repr__(self):
return "<C wxStaticBitmap instance>"
class wxStaticBitmap(wxStaticBitmapPtr):

61
utils/wxPython/src/msw/controls2.cpp
View File

@@ -2956,6 +2956,14 @@ static PyObject *_wrap_wxTreeItemData_SetId(PyObject *self, PyObject *args) {
return _resultobj;
}
static void *SwigwxTreeEventTowxNotifyEvent(void *ptr) {
wxTreeEvent *src;
wxNotifyEvent *dest;
src = (wxTreeEvent *) ptr;
dest = (wxNotifyEvent *) src;
return (void *) dest;
}
static void *SwigwxTreeEventTowxCommandEvent(void *ptr) {
wxTreeEvent *src;
wxCommandEvent *dest;
@@ -3078,28 +3086,31 @@ static PyObject *_wrap_wxTreeEvent_GetCode(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxTreeEvent_Veto(_swigobj) (_swigobj->Veto())
static PyObject *_wrap_wxTreeEvent_Veto(PyObject *self, PyObject *args) {
#define wxTreeEvent_GetLabel(_swigobj) (_swigobj->GetLabel())
static PyObject *_wrap_wxTreeEvent_GetLabel(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxString * _result;
wxTreeEvent * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxTreeEvent_Veto",&_argc0))
if(!PyArg_ParseTuple(args,"s:wxTreeEvent_GetLabel",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeEvent_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_Veto. Expected _wxTreeEvent_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeEvent_GetLabel. Expected _wxTreeEvent_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxTreeEvent_Veto(_arg0);
const wxString & _result_ref = wxTreeEvent_GetLabel(_arg0);
_result = (wxString *) &_result_ref;
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
}{
_resultobj = PyString_FromString(WXSTRINGCAST (*_result));
}
return _resultobj;
}
@@ -4801,6 +4812,31 @@ static PyObject *_wrap_wxTreeCtrl_Unselect(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxTreeCtrl_UnselectAll(_swigobj) (_swigobj->UnselectAll())
static PyObject *_wrap_wxTreeCtrl_UnselectAll(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxTreeCtrl * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxTreeCtrl_UnselectAll",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_UnselectAll. Expected _wxTreeCtrl_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxTreeCtrl_UnselectAll(_arg0);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxTreeCtrl_SelectItem(_swigobj,_swigarg0) (_swigobj->SelectItem(_swigarg0))
static PyObject *_wrap_wxTreeCtrl_SelectItem(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -5112,6 +5148,7 @@ static PyMethodDef controls2cMethods[] = {
{ "wxTreeCtrl_ScrollTo", _wrap_wxTreeCtrl_ScrollTo, 1 },
{ "wxTreeCtrl_EnsureVisible", _wrap_wxTreeCtrl_EnsureVisible, 1 },
{ "wxTreeCtrl_SelectItem", _wrap_wxTreeCtrl_SelectItem, 1 },
{ "wxTreeCtrl_UnselectAll", _wrap_wxTreeCtrl_UnselectAll, 1 },
{ "wxTreeCtrl_Unselect", _wrap_wxTreeCtrl_Unselect, 1 },
{ "wxTreeCtrl_Toggle", _wrap_wxTreeCtrl_Toggle, 1 },
{ "wxTreeCtrl_CollapseAndReset", _wrap_wxTreeCtrl_CollapseAndReset, 1 },
@@ -5158,7 +5195,7 @@ static PyMethodDef controls2cMethods[] = {
{ "wxTreeCtrl_GetIndent", _wrap_wxTreeCtrl_GetIndent, 1 },
{ "wxTreeCtrl_GetCount", _wrap_wxTreeCtrl_GetCount, 1 },
{ "new_wxTreeCtrl", _wrap_new_wxTreeCtrl, 1 },
{ "wxTreeEvent_Veto", _wrap_wxTreeEvent_Veto, 1 },
{ "wxTreeEvent_GetLabel", _wrap_wxTreeEvent_GetLabel, 1 },
{ "wxTreeEvent_GetCode", _wrap_wxTreeEvent_GetCode, 1 },
{ "wxTreeEvent_GetPoint", _wrap_wxTreeEvent_GetPoint, 1 },
{ "wxTreeEvent_GetOldItem", _wrap_wxTreeEvent_GetOldItem, 1 },
@@ -5344,10 +5381,11 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0);
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
SWIG_RegisterMapping("_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -5386,6 +5424,7 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
@@ -5415,11 +5454,14 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0);
SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0);
SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_class_wxNotifyEvent","_class_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
SWIG_RegisterMapping("_class_wxNotifyEvent","_wxTreeEvent",SwigwxTreeEventTowxNotifyEvent);
SWIG_RegisterMapping("_class_wxNotifyEvent","_wxNotifyEvent",0);
SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -5503,7 +5545,6 @@ SWIGEXPORT(void,initcontrols2c)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxListItem","_wxListItem",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);

13
utils/wxPython/src/msw/controls2.py
View File

@@ -15,7 +15,7 @@ class wxListItemPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, controls2c=controls2c):
if self.thisown == 1 :
controls2c.delete_wxListItem(self.this)
def __setattr__(self,name,value):
@@ -323,7 +323,7 @@ class wxTreeItemIdPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, controls2c=controls2c):
if self.thisown == 1 :
controls2c.delete_wxTreeItemId(self.this)
def IsOk(self):
@@ -366,7 +366,7 @@ class wxTreeItemData(wxTreeItemDataPtr):
class wxTreeEventPtr(wxCommandEventPtr):
class wxTreeEventPtr(wxNotifyEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -388,8 +388,8 @@ class wxTreeEventPtr(wxCommandEventPtr):
def GetCode(self):
val = controls2c.wxTreeEvent_GetCode(self.this)
return val
def Veto(self):
val = controls2c.wxTreeEvent_Veto(self.this)
def GetLabel(self):
val = controls2c.wxTreeEvent_GetLabel(self.this)
return val
def __repr__(self):
return "<C wxTreeEvent instance>"
@@ -582,6 +582,9 @@ class wxTreeCtrlPtr(wxControlPtr):
def Unselect(self):
val = controls2c.wxTreeCtrl_Unselect(self.this)
return val
def UnselectAll(self):
val = controls2c.wxTreeCtrl_UnselectAll(self.this)
return val
def SelectItem(self,arg0):
val = controls2c.wxTreeCtrl_SelectItem(self.this,arg0.this)
return val

2
utils/wxPython/src/msw/events.py
View File

@@ -609,7 +609,7 @@ class wxPyEventPtr(wxCommandEventPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, eventsc=eventsc):
if self.thisown == 1 :
eventsc.delete_wxPyEvent(self.this)
def SetUserData(self,arg0):

4
utils/wxPython/src/msw/frames.cpp
View File

@@ -926,7 +926,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -966,6 +965,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
@@ -994,6 +994,7 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -1072,7 +1073,6 @@ SWIGEXPORT(void,initframesc)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);

33
utils/wxPython/src/msw/gdi.cpp
View File

@@ -131,6 +131,13 @@ static char* wxStringErrorMsg = "string type is required for parameter";
return new wxBitmap(name, flags);
}
#ifdef __WXMSW__
wxBitmap* wxBitmapFromData(char* data, long type,
int width, int height, int depth = 1) {
return new wxBitmap((void*)data, type, width, height, depth);
}
#endif
wxMask* wxMaskColour(const wxBitmap& bitmap, const wxColour& colour) {
return new wxMask(bitmap, colour);
}
@@ -233,6 +240,29 @@ static PyObject *_wrap_wxNoRefBitmap(PyObject *self, PyObject *args) {
return _resultobj;
}
static PyObject *_wrap_wxBitmapFromData(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxBitmap * _result;
char * _arg0;
long _arg1;
int _arg2;
int _arg3;
int _arg4 = 1;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"slii|i:wxBitmapFromData",&_arg0,&_arg1,&_arg2,&_arg3,&_arg4))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxBitmap *)wxBitmapFromData(_arg0,_arg1,_arg2,_arg3,_arg4);
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyObject *_wrap_wxMaskColour(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxMask * _result;
@@ -5306,8 +5336,10 @@ static PyObject *_wrap_wxDC_StartPage(PyObject *self, PyObject *args) {
static void wxDC_DrawBitmap(wxDC *self,wxBitmap & bitmap,long x,long y,bool swapPalette) {
wxMemoryDC* memDC = new wxMemoryDC;
memDC->SelectObject(bitmap);
#ifdef __WXMSW__
if (swapPalette)
self->SetPalette(*bitmap.GetPalette());
#endif
self->Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), memDC,
0, 0, self->GetLogicalFunction());
memDC->SelectObject(wxNullBitmap);
@@ -6498,6 +6530,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxNamedColour", _wrap_wxNamedColour, 1 },
{ "wxStockCursor", _wrap_wxStockCursor, 1 },
{ "wxMaskColour", _wrap_wxMaskColour, 1 },
{ "wxBitmapFromData", _wrap_wxBitmapFromData, 1 },
{ "wxNoRefBitmap", _wrap_wxNoRefBitmap, 1 },
{ "wxEmptyBitmap", _wrap_wxEmptyBitmap, 1 },
{ NULL, NULL }

7350
utils/wxPython/src/msw/gdi.py
View File

File diff suppressed because it is too large Load Diff

6
utils/wxPython/src/msw/glcanvas.cpp
View File

@@ -9270,6 +9270,7 @@ SWIGEXPORT(void,initglcanvasc)() {
SWIG_RegisterMapping("_wxPrintQuality","_EBool",0);
SWIG_RegisterMapping("_wxPrintQuality","_size_t",0);
SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0);
SWIG_RegisterMapping("___wxPyCleanup","_class___wxPyCleanup",0);
SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0);
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxPyTreeItemData","_wxPyTreeItemData",0);
@@ -9299,7 +9300,6 @@ SWIGEXPORT(void,initglcanvasc)() {
SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
SWIG_RegisterMapping("_wxPNGHandler","_class_wxPNGHandler",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
SWIG_RegisterMapping("_class_wxPageSetupDialogData","_wxPageSetupDialogData",0);
SWIG_RegisterMapping("_wxPrinter","_class_wxPrinter",0);
@@ -9383,6 +9383,7 @@ SWIGEXPORT(void,initglcanvasc)() {
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
@@ -9425,6 +9426,7 @@ SWIGEXPORT(void,initglcanvasc)() {
SWIG_RegisterMapping("_class_wxButton","_wxButton",0);
SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0);
SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0);
SWIG_RegisterMapping("_class___wxPyCleanup","___wxPyCleanup",0);
SWIG_RegisterMapping("_GLclampf","_float",0);
SWIG_RegisterMapping("_GLclampf","_GLfloat",0);
SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0);
@@ -9457,6 +9459,7 @@ SWIGEXPORT(void,initglcanvasc)() {
SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
SWIG_RegisterMapping("_wxListItem","_class_wxListItem",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0);
SWIG_RegisterMapping("_EBool","_GLsizei",0);
@@ -9589,7 +9592,6 @@ SWIGEXPORT(void,initglcanvasc)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxListItem","_wxListItem",0);
SWIG_RegisterMapping("_GLdouble","_GLclampd",0);
SWIG_RegisterMapping("_GLdouble","_double",0);

2
utils/wxPython/src/msw/glcanvas.py
View File

@@ -35,7 +35,7 @@ class wxGLContextPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, glcanvasc=glcanvasc):
if self.thisown == 1 :
glcanvasc.delete_wxGLContext(self.this)
def SetCurrent(self):

28
utils/wxPython/src/msw/image.cpp
View File

@@ -814,6 +814,33 @@ static PyObject *_wrap_wxImage_Scale(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxImage_Rescale(_swigobj,_swigarg0,_swigarg1) (_swigobj->Rescale(_swigarg0,_swigarg1))
static PyObject *_wrap_wxImage_Rescale(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxImage * _arg0;
int _arg1;
int _arg2;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"sii:wxImage_Rescale",&_argc0,&_arg1,&_arg2))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImage_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_Rescale. Expected _wxImage_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxImage_Rescale(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxImage_SetRGB(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->SetRGB(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
static PyObject *_wrap_wxImage_SetRGB(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -1416,6 +1443,7 @@ static PyMethodDef imagecMethods[] = {
{ "wxImage_GetGreen", _wrap_wxImage_GetGreen, 1 },
{ "wxImage_GetRed", _wrap_wxImage_GetRed, 1 },
{ "wxImage_SetRGB", _wrap_wxImage_SetRGB, 1 },
{ "wxImage_Rescale", _wrap_wxImage_Rescale, 1 },
{ "wxImage_Scale", _wrap_wxImage_Scale, 1 },
{ "wxImage_Destroy", _wrap_wxImage_Destroy, 1 },
{ "wxImage_Create", _wrap_wxImage_Create, 1 },

5
utils/wxPython/src/msw/image.py
View File

@@ -102,7 +102,7 @@ class wxImagePtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, imagec=imagec):
if self.thisown == 1 :
imagec.delete_wxImage(self.this)
def ConvertToBitmap(self):
@@ -121,6 +121,9 @@ class wxImagePtr :
val = wxImagePtr(val)
val.thisown = 1
return val
def Rescale(self,arg0,arg1):
val = imagec.wxImage_Rescale(self.this,arg0,arg1)
return val
def SetRGB(self,arg0,arg1,arg2,arg3,arg4):
val = imagec.wxImage_SetRGB(self.this,arg0,arg1,arg2,arg3,arg4)
return val

13
utils/wxPython/src/msw/mdi.cpp
View File

@@ -543,14 +543,16 @@ static PyObject *_wrap_wxMDIChildFrame_Activate(PyObject *self, PyObject *args)
return _resultobj;
}
#define wxMDIChildFrame_Maximize(_swigobj) (_swigobj->Maximize())
#define wxMDIChildFrame_Maximize(_swigobj,_swigarg0) (_swigobj->Maximize(_swigarg0))
static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxMDIChildFrame * _arg0;
bool _arg1;
char * _argc0 = 0;
int tempbool1;
self = self;
if(!PyArg_ParseTuple(args,"s:wxMDIChildFrame_Maximize",&_argc0))
if(!PyArg_ParseTuple(args,"si:wxMDIChildFrame_Maximize",&_argc0,&tempbool1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMDIChildFrame_p")) {
@@ -558,9 +560,10 @@ static PyObject *_wrap_wxMDIChildFrame_Maximize(PyObject *self, PyObject *args)
return NULL;
}
}
_arg1 = (bool ) tempbool1;
{
wxPy_BEGIN_ALLOW_THREADS;
wxMDIChildFrame_Maximize(_arg0);
wxMDIChildFrame_Maximize(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
@@ -694,7 +697,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -734,6 +736,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
@@ -763,6 +766,7 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -846,7 +850,6 @@ SWIGEXPORT(void,initmdic)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);

4
utils/wxPython/src/msw/mdi.py
View File

@@ -73,8 +73,8 @@ class wxMDIChildFramePtr(wxFramePtr):
def Activate(self):
val = mdic.wxMDIChildFrame_Activate(self.this)
return val
def Maximize(self):
val = mdic.wxMDIChildFrame_Maximize(self.this)
def Maximize(self,arg0):
val = mdic.wxMDIChildFrame_Maximize(self.this,arg0)
return val
def Restore(self):
val = mdic.wxMDIChildFrame_Restore(self.this)

232
utils/wxPython/src/msw/misc.cpp
View File

@@ -121,6 +121,19 @@ static char* wxStringErrorMsg = "string type is required for parameter";
wxGetResource(section, entry, &retval, file);
return retval;
}
wxColour wxSystemSettings_GetSystemColour(int index) {
return wxSystemSettings::GetSystemColour(index);
}
wxFont wxSystemSettings_GetSystemFont(int index) {
return wxSystemSettings::GetSystemFont(index);
}
int wxSystemSettings_GetSystemMetric(int index) {
return wxSystemSettings::GetSystemMetric(index);
}
static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxString * _result;
@@ -448,6 +461,80 @@ static PyObject *_wrap_wxMessageBox(PyObject *self, PyObject *args) {
return _resultobj;
}
static PyObject *_wrap_wxGetNumberFromUser(PyObject *self, PyObject *args) {
PyObject * _resultobj;
long _result;
wxString * _arg0;
wxString * _arg1;
wxString * _arg2;
long _arg3;
long _arg4 = 0;
long _arg5 = 100;
wxWindow * _arg6 = NULL;
wxPoint * _arg7 = &wxPyDefaultPosition;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
PyObject * _obj2 = 0;
char * _argc6 = 0;
char * _argc7 = 0;
self = self;
if(!PyArg_ParseTuple(args,"OOOl|llss:wxGetNumberFromUser",&_obj0,&_obj1,&_obj2,&_arg3,&_arg4,&_arg5,&_argc6,&_argc7))
return NULL;
{
if (!PyString_Check(_obj0)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
}
{
if (!PyString_Check(_obj1)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg1 = new wxString(PyString_AsString(_obj1), PyString_Size(_obj1));
}
{
if (!PyString_Check(_obj2)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg2 = new wxString(PyString_AsString(_obj2), PyString_Size(_obj2));
}
if (_argc6) {
if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxGetNumberFromUser. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc7) {
if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxPoint_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of wxGetNumberFromUser. Expected _wxPoint_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (long )wxGetNumberFromUser(*_arg0,*_arg1,*_arg2,_arg3,_arg4,_arg5,_arg6,*_arg7);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("l",_result);
{
if (_obj0)
delete _arg0;
}
{
if (_obj1)
delete _arg1;
}
{
if (_obj2)
delete _arg2;
}
return _resultobj;
}
static PyObject *_wrap_wxColourDisplay(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
@@ -1172,6 +1259,61 @@ static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) {
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemColour(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxColour * _result;
int _arg0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemColour",&_arg0))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxColour (wxSystemSettings_GetSystemColour(_arg0));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxColour_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemFont(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxFont * _result;
int _arg0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemFont",&_arg0))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxFont (wxSystemSettings_GetSystemFont(_arg0));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
static PyObject *_wrap_wxSystemSettings_GetSystemMetric(PyObject *self, PyObject *args) {
PyObject * _resultobj;
int _result;
int _arg0;
self = self;
if(!PyArg_ParseTuple(args,"i:wxSystemSettings_GetSystemMetric",&_arg0))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (int )wxSystemSettings_GetSystemMetric(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval)
static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -4142,6 +4284,9 @@ static PyMethodDef misccMethods[] = {
{ "wxSize_y_set", _wrap_wxSize_y_set, 1 },
{ "wxSize_x_get", _wrap_wxSize_x_get, 1 },
{ "wxSize_x_set", _wrap_wxSize_x_set, 1 },
{ "wxSystemSettings_GetSystemMetric", _wrap_wxSystemSettings_GetSystemMetric, 1 },
{ "wxSystemSettings_GetSystemFont", _wrap_wxSystemSettings_GetSystemFont, 1 },
{ "wxSystemSettings_GetSystemColour", _wrap_wxSystemSettings_GetSystemColour, 1 },
{ "wxResourceParseString", _wrap_wxResourceParseString, 1 },
{ "wxResourceParseFile", _wrap_wxResourceParseFile, 1 },
{ "wxResourceParseData", _wrap_wxResourceParseData, 1 },
@@ -4177,6 +4322,7 @@ static PyMethodDef misccMethods[] = {
{ "wxSetCursor", _wrap_wxSetCursor, 1 },
{ "wxDisplayDepth", _wrap_wxDisplayDepth, 1 },
{ "wxColourDisplay", _wrap_wxColourDisplay, 1 },
{ "wxGetNumberFromUser", _wrap_wxGetNumberFromUser, 1 },
{ "wxMessageBox", _wrap_wxMessageBox, 1 },
{ "wxGetSingleChoiceIndex", _wrap_wxGetSingleChoiceIndex, 1 },
{ "wxGetSingleChoice", _wrap_wxGetSingleChoice, 1 },
@@ -4215,6 +4361,92 @@ SWIGEXPORT(void,initmiscc)() {
PyDict_SetItemString(d,"wxOutRegion", PyInt_FromLong((long) wxOutRegion));
PyDict_SetItemString(d,"wxPartRegion", PyInt_FromLong((long) wxPartRegion));
PyDict_SetItemString(d,"wxInRegion", PyInt_FromLong((long) wxInRegion));
PyDict_SetItemString(d,"wxSYS_WHITE_BRUSH", PyInt_FromLong((long) wxSYS_WHITE_BRUSH));
PyDict_SetItemString(d,"wxSYS_LTGRAY_BRUSH", PyInt_FromLong((long) wxSYS_LTGRAY_BRUSH));
PyDict_SetItemString(d,"wxSYS_GRAY_BRUSH", PyInt_FromLong((long) wxSYS_GRAY_BRUSH));
PyDict_SetItemString(d,"wxSYS_DKGRAY_BRUSH", PyInt_FromLong((long) wxSYS_DKGRAY_BRUSH));
PyDict_SetItemString(d,"wxSYS_BLACK_BRUSH", PyInt_FromLong((long) wxSYS_BLACK_BRUSH));
PyDict_SetItemString(d,"wxSYS_NULL_BRUSH", PyInt_FromLong((long) wxSYS_NULL_BRUSH));
PyDict_SetItemString(d,"wxSYS_HOLLOW_BRUSH", PyInt_FromLong((long) wxSYS_HOLLOW_BRUSH));
PyDict_SetItemString(d,"wxSYS_WHITE_PEN", PyInt_FromLong((long) wxSYS_WHITE_PEN));
PyDict_SetItemString(d,"wxSYS_BLACK_PEN", PyInt_FromLong((long) wxSYS_BLACK_PEN));
PyDict_SetItemString(d,"wxSYS_NULL_PEN", PyInt_FromLong((long) wxSYS_NULL_PEN));
PyDict_SetItemString(d,"wxSYS_OEM_FIXED_FONT", PyInt_FromLong((long) wxSYS_OEM_FIXED_FONT));
PyDict_SetItemString(d,"wxSYS_ANSI_FIXED_FONT", PyInt_FromLong((long) wxSYS_ANSI_FIXED_FONT));
PyDict_SetItemString(d,"wxSYS_ANSI_VAR_FONT", PyInt_FromLong((long) wxSYS_ANSI_VAR_FONT));
PyDict_SetItemString(d,"wxSYS_SYSTEM_FONT", PyInt_FromLong((long) wxSYS_SYSTEM_FONT));
PyDict_SetItemString(d,"wxSYS_DEVICE_DEFAULT_FONT", PyInt_FromLong((long) wxSYS_DEVICE_DEFAULT_FONT));
PyDict_SetItemString(d,"wxSYS_DEFAULT_PALETTE", PyInt_FromLong((long) wxSYS_DEFAULT_PALETTE));
PyDict_SetItemString(d,"wxSYS_SYSTEM_FIXED_FONT", PyInt_FromLong((long) wxSYS_SYSTEM_FIXED_FONT));
PyDict_SetItemString(d,"wxSYS_DEFAULT_GUI_FONT", PyInt_FromLong((long) wxSYS_DEFAULT_GUI_FONT));
PyDict_SetItemString(d,"wxSYS_COLOUR_SCROLLBAR", PyInt_FromLong((long) wxSYS_COLOUR_SCROLLBAR));
PyDict_SetItemString(d,"wxSYS_COLOUR_BACKGROUND", PyInt_FromLong((long) wxSYS_COLOUR_BACKGROUND));
PyDict_SetItemString(d,"wxSYS_COLOUR_ACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_ACTIVECAPTION));
PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTION));
PyDict_SetItemString(d,"wxSYS_COLOUR_MENU", PyInt_FromLong((long) wxSYS_COLOUR_MENU));
PyDict_SetItemString(d,"wxSYS_COLOUR_WINDOW", PyInt_FromLong((long) wxSYS_COLOUR_WINDOW));
PyDict_SetItemString(d,"wxSYS_COLOUR_WINDOWFRAME", PyInt_FromLong((long) wxSYS_COLOUR_WINDOWFRAME));
PyDict_SetItemString(d,"wxSYS_COLOUR_MENUTEXT", PyInt_FromLong((long) wxSYS_COLOUR_MENUTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_WINDOWTEXT", PyInt_FromLong((long) wxSYS_COLOUR_WINDOWTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_CAPTIONTEXT", PyInt_FromLong((long) wxSYS_COLOUR_CAPTIONTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_ACTIVEBORDER", PyInt_FromLong((long) wxSYS_COLOUR_ACTIVEBORDER));
PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVEBORDER", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVEBORDER));
PyDict_SetItemString(d,"wxSYS_COLOUR_APPWORKSPACE", PyInt_FromLong((long) wxSYS_COLOUR_APPWORKSPACE));
PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHT));
PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHTTEXT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHTTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNFACE", PyInt_FromLong((long) wxSYS_COLOUR_BTNFACE));
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_BTNSHADOW));
PyDict_SetItemString(d,"wxSYS_COLOUR_GRAYTEXT", PyInt_FromLong((long) wxSYS_COLOUR_GRAYTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNTEXT", PyInt_FromLong((long) wxSYS_COLOUR_BTNTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTIONTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTIONTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHIGHLIGHT));
PyDict_SetItemString(d,"wxSYS_COLOUR_3DDKSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DDKSHADOW));
PyDict_SetItemString(d,"wxSYS_COLOUR_3DLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DLIGHT));
PyDict_SetItemString(d,"wxSYS_COLOUR_INFOTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INFOTEXT));
PyDict_SetItemString(d,"wxSYS_COLOUR_INFOBK", PyInt_FromLong((long) wxSYS_COLOUR_INFOBK));
PyDict_SetItemString(d,"wxSYS_COLOUR_DESKTOP", PyInt_FromLong((long) wxSYS_COLOUR_DESKTOP));
PyDict_SetItemString(d,"wxSYS_COLOUR_3DFACE", PyInt_FromLong((long) wxSYS_COLOUR_3DFACE));
PyDict_SetItemString(d,"wxSYS_COLOUR_3DSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DSHADOW));
PyDict_SetItemString(d,"wxSYS_COLOUR_3DHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHIGHLIGHT));
PyDict_SetItemString(d,"wxSYS_COLOUR_3DHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHILIGHT));
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHILIGHT));
PyDict_SetItemString(d,"wxSYS_MOUSE_BUTTONS", PyInt_FromLong((long) wxSYS_MOUSE_BUTTONS));
PyDict_SetItemString(d,"wxSYS_BORDER_X", PyInt_FromLong((long) wxSYS_BORDER_X));
PyDict_SetItemString(d,"wxSYS_BORDER_Y", PyInt_FromLong((long) wxSYS_BORDER_Y));
PyDict_SetItemString(d,"wxSYS_CURSOR_X", PyInt_FromLong((long) wxSYS_CURSOR_X));
PyDict_SetItemString(d,"wxSYS_CURSOR_Y", PyInt_FromLong((long) wxSYS_CURSOR_Y));
PyDict_SetItemString(d,"wxSYS_DCLICK_X", PyInt_FromLong((long) wxSYS_DCLICK_X));
PyDict_SetItemString(d,"wxSYS_DCLICK_Y", PyInt_FromLong((long) wxSYS_DCLICK_Y));
PyDict_SetItemString(d,"wxSYS_DRAG_X", PyInt_FromLong((long) wxSYS_DRAG_X));
PyDict_SetItemString(d,"wxSYS_DRAG_Y", PyInt_FromLong((long) wxSYS_DRAG_Y));
PyDict_SetItemString(d,"wxSYS_EDGE_X", PyInt_FromLong((long) wxSYS_EDGE_X));
PyDict_SetItemString(d,"wxSYS_EDGE_Y", PyInt_FromLong((long) wxSYS_EDGE_Y));
PyDict_SetItemString(d,"wxSYS_HSCROLL_ARROW_X", PyInt_FromLong((long) wxSYS_HSCROLL_ARROW_X));
PyDict_SetItemString(d,"wxSYS_HSCROLL_ARROW_Y", PyInt_FromLong((long) wxSYS_HSCROLL_ARROW_Y));
PyDict_SetItemString(d,"wxSYS_HTHUMB_X", PyInt_FromLong((long) wxSYS_HTHUMB_X));
PyDict_SetItemString(d,"wxSYS_ICON_X", PyInt_FromLong((long) wxSYS_ICON_X));
PyDict_SetItemString(d,"wxSYS_ICON_Y", PyInt_FromLong((long) wxSYS_ICON_Y));
PyDict_SetItemString(d,"wxSYS_ICONSPACING_X", PyInt_FromLong((long) wxSYS_ICONSPACING_X));
PyDict_SetItemString(d,"wxSYS_ICONSPACING_Y", PyInt_FromLong((long) wxSYS_ICONSPACING_Y));
PyDict_SetItemString(d,"wxSYS_WINDOWMIN_X", PyInt_FromLong((long) wxSYS_WINDOWMIN_X));
PyDict_SetItemString(d,"wxSYS_WINDOWMIN_Y", PyInt_FromLong((long) wxSYS_WINDOWMIN_Y));
PyDict_SetItemString(d,"wxSYS_SCREEN_X", PyInt_FromLong((long) wxSYS_SCREEN_X));
PyDict_SetItemString(d,"wxSYS_SCREEN_Y", PyInt_FromLong((long) wxSYS_SCREEN_Y));
PyDict_SetItemString(d,"wxSYS_FRAMESIZE_X", PyInt_FromLong((long) wxSYS_FRAMESIZE_X));
PyDict_SetItemString(d,"wxSYS_FRAMESIZE_Y", PyInt_FromLong((long) wxSYS_FRAMESIZE_Y));
PyDict_SetItemString(d,"wxSYS_SMALLICON_X", PyInt_FromLong((long) wxSYS_SMALLICON_X));
PyDict_SetItemString(d,"wxSYS_SMALLICON_Y", PyInt_FromLong((long) wxSYS_SMALLICON_Y));
PyDict_SetItemString(d,"wxSYS_HSCROLL_Y", PyInt_FromLong((long) wxSYS_HSCROLL_Y));
PyDict_SetItemString(d,"wxSYS_VSCROLL_X", PyInt_FromLong((long) wxSYS_VSCROLL_X));
PyDict_SetItemString(d,"wxSYS_VSCROLL_ARROW_X", PyInt_FromLong((long) wxSYS_VSCROLL_ARROW_X));
PyDict_SetItemString(d,"wxSYS_VSCROLL_ARROW_Y", PyInt_FromLong((long) wxSYS_VSCROLL_ARROW_Y));
PyDict_SetItemString(d,"wxSYS_VTHUMB_Y", PyInt_FromLong((long) wxSYS_VTHUMB_Y));
PyDict_SetItemString(d,"wxSYS_CAPTION_Y", PyInt_FromLong((long) wxSYS_CAPTION_Y));
PyDict_SetItemString(d,"wxSYS_MENU_Y", PyInt_FromLong((long) wxSYS_MENU_Y));
PyDict_SetItemString(d,"wxSYS_NETWORK_PRESENT", PyInt_FromLong((long) wxSYS_NETWORK_PRESENT));
PyDict_SetItemString(d,"wxSYS_PENWINDOWS_PRESENT", PyInt_FromLong((long) wxSYS_PENWINDOWS_PRESENT));
PyDict_SetItemString(d,"wxSYS_SHOW_SOUNDS", PyInt_FromLong((long) wxSYS_SHOW_SOUNDS));
PyDict_SetItemString(d,"wxSYS_SWAP_BUTTONS", PyInt_FromLong((long) wxSYS_SWAP_BUTTONS));
/*
* These are the pointer type-equivalency mappings.
* (Used by the SWIG pointer type-checker).

124
utils/wxPython/src/msw/misc.py
View File

@@ -4,7 +4,7 @@ class wxSizePtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxSize(self.this)
def Set(self,arg0,arg1):
@@ -71,7 +71,7 @@ class wxRealPointPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxRealPoint(self.this)
def __setattr__(self,name,value):
@@ -102,7 +102,7 @@ class wxPointPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxPoint(self.this)
def Set(self,arg0,arg1):
@@ -141,7 +141,7 @@ class wxRectPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxRect(self.this)
def GetX(self):
@@ -233,7 +233,7 @@ class wxPyTimerPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxPyTimer(self.this)
def Interval(self):
@@ -360,7 +360,7 @@ class wxRegionPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxRegion(self.this)
def Clear(self):
@@ -409,7 +409,7 @@ class wxRegionIteratorPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, miscc=miscc):
if self.thisown == 1 :
miscc.delete_wxRegionIterator(self.this)
def GetX(self):
@@ -538,6 +538,16 @@ def wxMessageBox(arg0,*args):
val = apply(miscc.wxMessageBox,(arg0,)+args)
return val
def wxGetNumberFromUser(arg0,arg1,arg2,arg3,*args):
argl = map(None,args)
try: argl[2] = argl[2].this
except: pass
try: argl[3] = argl[3].this
except: pass
args = tuple(argl)
val = apply(miscc.wxGetNumberFromUser,(arg0,arg1,arg2,arg3,)+args)
return val
wxColourDisplay = miscc.wxColourDisplay
wxDisplayDepth = miscc.wxDisplayDepth
@@ -630,6 +640,20 @@ wxResourceParseFile = miscc.wxResourceParseFile
wxResourceParseString = miscc.wxResourceParseString
def wxSystemSettings_GetSystemColour(arg0):
val = miscc.wxSystemSettings_GetSystemColour(arg0)
val = wxColourPtr(val)
val.thisown = 1
return val
def wxSystemSettings_GetSystemFont(arg0):
val = miscc.wxSystemSettings_GetSystemFont(arg0)
val = wxFontPtr(val)
val.thisown = 1
return val
wxSystemSettings_GetSystemMetric = miscc.wxSystemSettings_GetSystemMetric
#-------------- VARIABLE WRAPPERS ------------------
@@ -656,3 +680,89 @@ wxAbsolute = miscc.wxAbsolute
wxOutRegion = miscc.wxOutRegion
wxPartRegion = miscc.wxPartRegion
wxInRegion = miscc.wxInRegion
wxSYS_WHITE_BRUSH = miscc.wxSYS_WHITE_BRUSH
wxSYS_LTGRAY_BRUSH = miscc.wxSYS_LTGRAY_BRUSH
wxSYS_GRAY_BRUSH = miscc.wxSYS_GRAY_BRUSH
wxSYS_DKGRAY_BRUSH = miscc.wxSYS_DKGRAY_BRUSH
wxSYS_BLACK_BRUSH = miscc.wxSYS_BLACK_BRUSH
wxSYS_NULL_BRUSH = miscc.wxSYS_NULL_BRUSH
wxSYS_HOLLOW_BRUSH = miscc.wxSYS_HOLLOW_BRUSH
wxSYS_WHITE_PEN = miscc.wxSYS_WHITE_PEN
wxSYS_BLACK_PEN = miscc.wxSYS_BLACK_PEN
wxSYS_NULL_PEN = miscc.wxSYS_NULL_PEN
wxSYS_OEM_FIXED_FONT = miscc.wxSYS_OEM_FIXED_FONT
wxSYS_ANSI_FIXED_FONT = miscc.wxSYS_ANSI_FIXED_FONT
wxSYS_ANSI_VAR_FONT = miscc.wxSYS_ANSI_VAR_FONT
wxSYS_SYSTEM_FONT = miscc.wxSYS_SYSTEM_FONT
wxSYS_DEVICE_DEFAULT_FONT = miscc.wxSYS_DEVICE_DEFAULT_FONT
wxSYS_DEFAULT_PALETTE = miscc.wxSYS_DEFAULT_PALETTE
wxSYS_SYSTEM_FIXED_FONT = miscc.wxSYS_SYSTEM_FIXED_FONT
wxSYS_DEFAULT_GUI_FONT = miscc.wxSYS_DEFAULT_GUI_FONT
wxSYS_COLOUR_SCROLLBAR = miscc.wxSYS_COLOUR_SCROLLBAR
wxSYS_COLOUR_BACKGROUND = miscc.wxSYS_COLOUR_BACKGROUND
wxSYS_COLOUR_ACTIVECAPTION = miscc.wxSYS_COLOUR_ACTIVECAPTION
wxSYS_COLOUR_INACTIVECAPTION = miscc.wxSYS_COLOUR_INACTIVECAPTION
wxSYS_COLOUR_MENU = miscc.wxSYS_COLOUR_MENU
wxSYS_COLOUR_WINDOW = miscc.wxSYS_COLOUR_WINDOW
wxSYS_COLOUR_WINDOWFRAME = miscc.wxSYS_COLOUR_WINDOWFRAME
wxSYS_COLOUR_MENUTEXT = miscc.wxSYS_COLOUR_MENUTEXT
wxSYS_COLOUR_WINDOWTEXT = miscc.wxSYS_COLOUR_WINDOWTEXT
wxSYS_COLOUR_CAPTIONTEXT = miscc.wxSYS_COLOUR_CAPTIONTEXT
wxSYS_COLOUR_ACTIVEBORDER = miscc.wxSYS_COLOUR_ACTIVEBORDER
wxSYS_COLOUR_INACTIVEBORDER = miscc.wxSYS_COLOUR_INACTIVEBORDER
wxSYS_COLOUR_APPWORKSPACE = miscc.wxSYS_COLOUR_APPWORKSPACE
wxSYS_COLOUR_HIGHLIGHT = miscc.wxSYS_COLOUR_HIGHLIGHT
wxSYS_COLOUR_HIGHLIGHTTEXT = miscc.wxSYS_COLOUR_HIGHLIGHTTEXT
wxSYS_COLOUR_BTNFACE = miscc.wxSYS_COLOUR_BTNFACE
wxSYS_COLOUR_BTNSHADOW = miscc.wxSYS_COLOUR_BTNSHADOW
wxSYS_COLOUR_GRAYTEXT = miscc.wxSYS_COLOUR_GRAYTEXT
wxSYS_COLOUR_BTNTEXT = miscc.wxSYS_COLOUR_BTNTEXT
wxSYS_COLOUR_INACTIVECAPTIONTEXT = miscc.wxSYS_COLOUR_INACTIVECAPTIONTEXT
wxSYS_COLOUR_BTNHIGHLIGHT = miscc.wxSYS_COLOUR_BTNHIGHLIGHT
wxSYS_COLOUR_3DDKSHADOW = miscc.wxSYS_COLOUR_3DDKSHADOW
wxSYS_COLOUR_3DLIGHT = miscc.wxSYS_COLOUR_3DLIGHT
wxSYS_COLOUR_INFOTEXT = miscc.wxSYS_COLOUR_INFOTEXT
wxSYS_COLOUR_INFOBK = miscc.wxSYS_COLOUR_INFOBK
wxSYS_COLOUR_DESKTOP = miscc.wxSYS_COLOUR_DESKTOP
wxSYS_COLOUR_3DFACE = miscc.wxSYS_COLOUR_3DFACE
wxSYS_COLOUR_3DSHADOW = miscc.wxSYS_COLOUR_3DSHADOW
wxSYS_COLOUR_3DHIGHLIGHT = miscc.wxSYS_COLOUR_3DHIGHLIGHT
wxSYS_COLOUR_3DHILIGHT = miscc.wxSYS_COLOUR_3DHILIGHT
wxSYS_COLOUR_BTNHILIGHT = miscc.wxSYS_COLOUR_BTNHILIGHT
wxSYS_MOUSE_BUTTONS = miscc.wxSYS_MOUSE_BUTTONS
wxSYS_BORDER_X = miscc.wxSYS_BORDER_X
wxSYS_BORDER_Y = miscc.wxSYS_BORDER_Y
wxSYS_CURSOR_X = miscc.wxSYS_CURSOR_X
wxSYS_CURSOR_Y = miscc.wxSYS_CURSOR_Y
wxSYS_DCLICK_X = miscc.wxSYS_DCLICK_X
wxSYS_DCLICK_Y = miscc.wxSYS_DCLICK_Y
wxSYS_DRAG_X = miscc.wxSYS_DRAG_X
wxSYS_DRAG_Y = miscc.wxSYS_DRAG_Y
wxSYS_EDGE_X = miscc.wxSYS_EDGE_X
wxSYS_EDGE_Y = miscc.wxSYS_EDGE_Y
wxSYS_HSCROLL_ARROW_X = miscc.wxSYS_HSCROLL_ARROW_X
wxSYS_HSCROLL_ARROW_Y = miscc.wxSYS_HSCROLL_ARROW_Y
wxSYS_HTHUMB_X = miscc.wxSYS_HTHUMB_X
wxSYS_ICON_X = miscc.wxSYS_ICON_X
wxSYS_ICON_Y = miscc.wxSYS_ICON_Y
wxSYS_ICONSPACING_X = miscc.wxSYS_ICONSPACING_X
wxSYS_ICONSPACING_Y = miscc.wxSYS_ICONSPACING_Y
wxSYS_WINDOWMIN_X = miscc.wxSYS_WINDOWMIN_X
wxSYS_WINDOWMIN_Y = miscc.wxSYS_WINDOWMIN_Y
wxSYS_SCREEN_X = miscc.wxSYS_SCREEN_X
wxSYS_SCREEN_Y = miscc.wxSYS_SCREEN_Y
wxSYS_FRAMESIZE_X = miscc.wxSYS_FRAMESIZE_X
wxSYS_FRAMESIZE_Y = miscc.wxSYS_FRAMESIZE_Y
wxSYS_SMALLICON_X = miscc.wxSYS_SMALLICON_X
wxSYS_SMALLICON_Y = miscc.wxSYS_SMALLICON_Y
wxSYS_HSCROLL_Y = miscc.wxSYS_HSCROLL_Y
wxSYS_VSCROLL_X = miscc.wxSYS_VSCROLL_X
wxSYS_VSCROLL_ARROW_X = miscc.wxSYS_VSCROLL_ARROW_X
wxSYS_VSCROLL_ARROW_Y = miscc.wxSYS_VSCROLL_ARROW_Y
wxSYS_VTHUMB_Y = miscc.wxSYS_VTHUMB_Y
wxSYS_CAPTION_Y = miscc.wxSYS_CAPTION_Y
wxSYS_MENU_Y = miscc.wxSYS_MENU_Y
wxSYS_NETWORK_PRESENT = miscc.wxSYS_NETWORK_PRESENT
wxSYS_PENWINDOWS_PRESENT = miscc.wxSYS_PENWINDOWS_PRESENT
wxSYS_SHOW_SOUNDS = miscc.wxSYS_SHOW_SOUNDS
wxSYS_SWAP_BUTTONS = miscc.wxSYS_SWAP_BUTTONS

2
utils/wxPython/src/msw/misc2.cpp
View File

@@ -404,7 +404,6 @@ SWIGEXPORT(void,initmisc2c)() {
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
SWIG_RegisterMapping("_long","_wxDash",0);
@@ -488,7 +487,6 @@ SWIGEXPORT(void,initmisc2c)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);

4
utils/wxPython/src/msw/printfw.cpp
View File

@@ -4006,7 +4006,6 @@ SWIGEXPORT(void,initprintfwc)() {
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0);
SWIG_RegisterMapping("_class_wxPageSetupDialogData","_wxPageSetupDialogData",0);
SWIG_RegisterMapping("_wxPrinter","_class_wxPrinter",0);
@@ -4064,6 +4063,7 @@ SWIGEXPORT(void,initprintfwc)() {
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxMiniFrame","_class_wxMiniFrame",0);
SWIG_RegisterMapping("_class_wxPyPrintout","_wxPyPrintout",0);
@@ -4099,6 +4099,7 @@ SWIGEXPORT(void,initprintfwc)() {
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -4195,7 +4196,6 @@ SWIGEXPORT(void,initprintfwc)() {
SWIG_RegisterMapping("_wxDialog","_class_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog);
SWIG_RegisterMapping("_wxDialog","_wxPageSetupDialog",SwigwxPageSetupDialogTowxDialog);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_class_wxFileDialog","_wxFileDialog",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);

8
utils/wxPython/src/msw/printfw.py
View File

@@ -21,7 +21,7 @@ class wxPrintDataPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, printfwc=printfwc):
if self.thisown == 1 :
printfwc.delete_wxPrintData(self.this)
def GetNoCopies(self):
@@ -93,7 +93,7 @@ class wxPageSetupDialogDataPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, printfwc=printfwc):
if self.thisown == 1 :
printfwc.delete_wxPageSetupDialogData(self.this)
def EnableHelp(self,arg0):
@@ -232,7 +232,7 @@ class wxPrintDialogDataPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, printfwc=printfwc):
if self.thisown == 1 :
printfwc.delete_wxPrintDialogData(self.this)
def EnableHelp(self,arg0):
@@ -409,7 +409,7 @@ class wxPrinterPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, printfwc=printfwc):
if self.thisown == 1 :
printfwc.delete_wxPrinter(self.this)
def CreateAbortWindow(self,arg0,arg1):

4
utils/wxPython/src/msw/stattool.cpp
View File

@@ -2386,7 +2386,6 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -2426,6 +2425,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
SWIG_RegisterMapping("_uint","_wxPrintQuality",0);
@@ -2453,6 +2453,7 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -2533,7 +2534,6 @@ SWIGEXPORT(void,initstattoolc)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);

2
utils/wxPython/src/msw/stattool.py
View File

@@ -65,7 +65,7 @@ class wxToolBarToolPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, stattoolc=stattoolc):
if self.thisown == 1 :
stattoolc.delete_wxToolBarTool(self.this)
def SetSize(self,arg0,arg1):

46
utils/wxPython/src/msw/utils.cpp
View File

@@ -33,8 +33,50 @@
* and things like that.
*
* $Log$
* Revision 1.7 1999/06/22 18:01:12 RD
* wxPython 2.1b1: More more set of generated sources...
* Revision 1.8 1999/07/31 07:56:02 RD
* wxPython 2.1b1:
*
* Added the missing wxWindow.GetUpdateRegion() method.
*
* Made a new change in SWIG (update your patches everybody) that
* provides a fix for global shadow objects that get an exception in
* their __del__ when their extension module has already been deleted.
* It was only a 1 line change in .../SWIG/Modules/pycpp.cxx at about
* line 496 if you want to do it by hand.
*
* It is now possible to run through MainLoop more than once in any one
* process. The cleanup that used to happen as MainLoop completed (and
* prevented it from running again) has been delayed until the wxc module
* is being unloaded by Python.
*
* wxWindow.PopupMenu() now takes a wxPoint instead of x,y. Added
* wxWindow.PopupMenuXY to be consistent with some other methods.
*
* Added wxGrid.SetEditInPlace and wxGrid.GetEditInPlace.
*
* You can now provide your own app.MainLoop method. See
* wxPython/demo/demoMainLoop.py for an example and some explaination.
*
* Got the in-place-edit for the wxTreeCtrl fixed and added some demo
* code to show how to use it.
*
* Put the wxIcon constructor back in for GTK as it now has one that
* matches MSW's.
*
* Added wxGrid.GetCells
*
* Added wxSystemSettings static methods as functions with names like
* wxSystemSettings_GetSystemColour.
*
* Removed wxPyMenu since using menu callbacks have been depreciated in
* wxWindows. Use wxMenu and events instead.
*
* Added alternate wxBitmap constructor (for MSW only) as
* wxBitmapFromData(data, type, width, height, depth = 1)
*
* Added a helper function named wxPyTypeCast that can convert shadow
* objects of one type into shadow objects of another type. (Like doing
* a down-cast.) See the implementation in wx.py for some docs.
*
************************************************************************/

2
utils/wxPython/src/msw/utils.py
View File

@@ -4,7 +4,7 @@ class wxConfigPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, utilsc=utilsc):
if self.thisown == 1 :
utilsc.delete_wxConfig(self.this)
def DontCreateOnDemand(self):

183
utils/wxPython/src/msw/windows.cpp
View File

@@ -317,7 +317,7 @@ static PyObject *_wrap_wxWindow_CaptureMouse(PyObject *self, PyObject *args) {
static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int _arg1 = (wxHORIZONTAL);
int _arg1 = (wxBOTH);
char * _argc0 = 0;
self = self;
@@ -343,7 +343,7 @@ static PyObject *_wrap_wxWindow_Center(PyObject *self, PyObject *args) {
static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int _arg1 = (wxHORIZONTAL);
int _arg1 = (wxBOTH);
char * _argc0 = 0;
self = self;
@@ -369,7 +369,7 @@ static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) {
static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int _arg1 = (wxHORIZONTAL);
int _arg1 = (wxBOTH);
char * _argc0 = 0;
self = self;
@@ -395,7 +395,7 @@ static PyObject *_wrap_wxWindow_CentreOnParent(PyObject *self, PyObject *args) {
static PyObject *_wrap_wxWindow_CenterOnParent(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxWindow * _arg0;
int _arg1 = (wxHORIZONTAL);
int _arg1 = (wxBOTH);
char * _argc0 = 0;
self = self;
@@ -1557,6 +1557,33 @@ static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_GetUpdateRegion(_swigobj) (_swigobj->GetUpdateRegion())
static PyObject *_wrap_wxWindow_GetUpdateRegion(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxRegion * _result;
wxWindow * _arg0;
char * _argc0 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"s:wxWindow_GetUpdateRegion",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetUpdateRegion. Expected _wxWindow_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = new wxRegion (wxWindow_GetUpdateRegion(_arg0));
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxRegion_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxWindow_GetWindowStyleFlag(_swigobj) (_swigobj->GetWindowStyleFlag())
static PyObject *_wrap_wxWindow_GetWindowStyleFlag(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -1924,8 +1951,8 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
#define wxWindow_PopupMenuXY(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxWindow * _arg0;
@@ -1936,7 +1963,42 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
char * _argc1 = 0;
self = self;
if(!PyArg_ParseTuple(args,"ssii:wxWindow_PopupMenu",&_argc0,&_argc1,&_arg2,&_arg3))
if(!PyArg_ParseTuple(args,"ssii:wxWindow_PopupMenuXY",&_argc0,&_argc1,&_arg2,&_arg3))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_PopupMenuXY. Expected _wxWindow_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxMenu_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_PopupMenuXY. Expected _wxMenu_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (bool )wxWindow_PopupMenuXY(_arg0,_arg1,_arg2,_arg3);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxWindow_PopupMenu(_swigobj,_swigarg0,_swigarg1) (_swigobj->PopupMenu(_swigarg0,_swigarg1))
static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxWindow * _arg0;
wxMenu * _arg1;
wxPoint * _arg2;
char * _argc0 = 0;
char * _argc1 = 0;
char * _argc2 = 0;
self = self;
if(!PyArg_ParseTuple(args,"sss:wxWindow_PopupMenu",&_argc0,&_argc1,&_argc2))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) {
@@ -1950,9 +2012,15 @@ static PyObject *_wrap_wxWindow_PopupMenu(PyObject *self, PyObject *args) {
return NULL;
}
}
if (_argc2) {
if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxWindow_PopupMenu. Expected _wxPoint_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (bool )wxWindow_PopupMenu(_arg0,_arg1,_arg2,_arg3);
_result = (bool )wxWindow_PopupMenu(_arg0,_arg1,*_arg2);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
@@ -4091,16 +4159,17 @@ static void *SwigwxMenuTowxEvtHandler(void *ptr) {
return (void *) dest;
}
#define new_wxMenu(_swigarg0) (new wxMenu(_swigarg0))
#define new_wxMenu(_swigarg0,_swigarg1) (new wxMenu(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxMenu * _result;
wxString * _arg0 = &wxPyEmptyStr;
long _arg1 = 0;
PyObject * _obj0 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"|O:new_wxMenu",&_obj0))
if(!PyArg_ParseTuple(args,"|Ol:new_wxMenu",&_obj0,&_arg1))
return NULL;
if (_obj0)
{
@@ -4112,7 +4181,7 @@ static PyObject *_wrap_new_wxMenu(PyObject *self, PyObject *args) {
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxMenu *)new_wxMenu(*_arg0);
_result = (wxMenu *)new_wxMenu(*_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenu_p");
@@ -4706,79 +4775,32 @@ static PyObject *_wrap_wxMenu_SetLabel(PyObject *self, PyObject *args) {
return _resultobj;
}
static void *SwigwxPyMenuTowxMenu(void *ptr) {
wxPyMenu *src;
wxMenu *dest;
src = (wxPyMenu *) ptr;
dest = (wxMenu *) src;
return (void *) dest;
}
static void *SwigwxPyMenuTowxEvtHandler(void *ptr) {
wxPyMenu *src;
wxEvtHandler *dest;
src = (wxPyMenu *) ptr;
dest = (wxEvtHandler *) src;
return (void *) dest;
}
#define new_wxPyMenu(_swigarg0,_swigarg1) (new wxPyMenu(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxPyMenu(PyObject *self, PyObject *args) {
#define wxMenu_UpdateUI(_swigobj,_swigarg0) (_swigobj->UpdateUI(_swigarg0))
static PyObject *_wrap_wxMenu_UpdateUI(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPyMenu * _result;
wxString * _arg0 = &wxPyEmptyStr;
PyObject * _arg1 = NULL;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
char _ptemp[128];
self = self;
if(!PyArg_ParseTuple(args,"|OO:new_wxPyMenu",&_obj0,&_obj1))
return NULL;
if (_obj0)
{
if (!PyString_Check(_obj0)) {
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
return NULL;
}
_arg0 = new wxString(PyString_AsString(_obj0), PyString_Size(_obj0));
}
if (_obj1)
{
_arg1 = _obj1;
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxPyMenu *)new_wxPyMenu(*_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} SWIG_MakePtr(_ptemp, (char *) _result,"_wxPyMenu_p");
_resultobj = Py_BuildValue("s",_ptemp);
{
if (_obj0)
delete _arg0;
}
return _resultobj;
}
#define delete_wxPyMenu(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxPyMenu(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxPyMenu * _arg0;
wxMenu * _arg0;
wxEvtHandler * _arg1 = NULL;
char * _argc0 = 0;
char * _argc1 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:delete_wxPyMenu",&_argc0))
if(!PyArg_ParseTuple(args,"s|s:wxMenu_UpdateUI",&_argc0,&_argc1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPyMenu_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPyMenu. Expected _wxPyMenu_p.");
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_UpdateUI. Expected _wxMenu_p.");
return NULL;
}
}
if (_argc1) {
if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxEvtHandler_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxMenu_UpdateUI. Expected _wxEvtHandler_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
delete_wxPyMenu(_arg0);
wxMenu_UpdateUI(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
@@ -6123,8 +6145,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxMenuBar_Check", _wrap_wxMenuBar_Check, 1 },
{ "wxMenuBar_Append", _wrap_wxMenuBar_Append, 1 },
{ "new_wxMenuBar", _wrap_new_wxMenuBar, 1 },
{ "delete_wxPyMenu", _wrap_delete_wxPyMenu, 1 },
{ "new_wxPyMenu", _wrap_new_wxPyMenu, 1 },
{ "wxMenu_UpdateUI", _wrap_wxMenu_UpdateUI, 1 },
{ "wxMenu_SetLabel", _wrap_wxMenu_SetLabel, 1 },
{ "wxMenu_IsEnabled", _wrap_wxMenu_IsEnabled, 1 },
{ "wxMenu_IsChecked", _wrap_wxMenu_IsChecked, 1 },
@@ -6210,6 +6231,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 },
{ "wxWindow_Raise", _wrap_wxWindow_Raise, 1 },
{ "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 },
{ "wxWindow_PopupMenuXY", _wrap_wxWindow_PopupMenuXY, 1 },
{ "wxWindow_Move", _wrap_wxWindow_Move, 1 },
{ "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, 1 },
{ "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 },
@@ -6223,6 +6245,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 },
{ "wxWindow_Hide", _wrap_wxWindow_Hide, 1 },
{ "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 },
{ "wxWindow_GetUpdateRegion", _wrap_wxWindow_GetUpdateRegion, 1 },
{ "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 },
{ "wxWindow_GetFullTextExtent", _wrap_wxWindow_GetFullTextExtent, 1 },
{ "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 },
@@ -6296,8 +6319,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);
@@ -6312,7 +6333,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0);
SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
SWIG_RegisterMapping("_long","_wxDash",0);
@@ -6372,8 +6392,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_signed_int","_int",0);
SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0);
SWIG_RegisterMapping("_wxMetaFileDC","_class_wxMetaFileDC",0);
SWIG_RegisterMapping("_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu);
SWIG_RegisterMapping("_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu);
SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0);
SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0);
SWIG_RegisterMapping("_WXTYPE","_short",0);
@@ -6403,8 +6421,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0);
SWIG_RegisterMapping("_unsigned_char","_byte",0);
SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0);
SWIG_RegisterMapping("_class_wxMenu","_class_wxPyMenu",SwigwxPyMenuTowxMenu);
SWIG_RegisterMapping("_class_wxMenu","_wxPyMenu",SwigwxPyMenuTowxMenu);
SWIG_RegisterMapping("_class_wxMenu","_wxMenu",0);
SWIG_RegisterMapping("_unsigned_int","_wxPrintQuality",0);
SWIG_RegisterMapping("_unsigned_int","_size_t",0);
@@ -6413,7 +6429,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);
@@ -6450,8 +6465,6 @@ SWIGEXPORT(void,initwindowsc)() {
SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_wxMenuBar",SwigwxMenuBarTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_wxPyMenu",SwigwxPyMenuTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxMenu",SwigwxMenuTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_wxMenu",SwigwxMenuTowxEvtHandler);
SWIG_RegisterMapping("_wxEvtHandler","_class_wxScrolledWindow",SwigwxScrolledWindowTowxEvtHandler);

36
utils/wxPython/src/msw/windows.py
View File

@@ -185,6 +185,11 @@ class wxWindowPtr(wxEvtHandlerPtr):
def GetTitle(self):
val = windowsc.wxWindow_GetTitle(self.this)
return val
def GetUpdateRegion(self):
val = windowsc.wxWindow_GetUpdateRegion(self.this)
val = wxRegionPtr(val)
val.thisown = 1
return val
def GetWindowStyleFlag(self):
val = windowsc.wxWindow_GetWindowStyleFlag(self.this)
return val
@@ -224,8 +229,11 @@ class wxWindowPtr(wxEvtHandlerPtr):
def Move(self,arg0):
val = windowsc.wxWindow_Move(self.this,arg0.this)
return val
def PopupMenu(self,arg0,arg1,arg2):
val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2)
def PopupMenuXY(self,arg0,arg1,arg2):
val = windowsc.wxWindow_PopupMenuXY(self.this,arg0.this,arg1,arg2)
return val
def PopupMenu(self,arg0,arg1):
val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1.this)
return val
def Raise(self):
val = windowsc.wxWindow_Raise(self.this)
@@ -584,6 +592,13 @@ class wxMenuPtr(wxEvtHandlerPtr):
def SetLabel(self,arg0,arg1):
val = windowsc.wxMenu_SetLabel(self.this,arg0,arg1)
return val
def UpdateUI(self,*args):
argl = map(None,args)
try: argl[0] = argl[0].this
except: pass
args = tuple(argl)
val = apply(windowsc.wxMenu_UpdateUI,(self.this,)+args)
return val
def __repr__(self):
return "<C wxMenu instance>"
class wxMenu(wxMenuPtr):
@@ -594,23 +609,6 @@ class wxMenu(wxMenuPtr):
class wxPyMenuPtr(wxMenuPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
if self.thisown == 1 :
windowsc.delete_wxPyMenu(self.this)
def __repr__(self):
return "<C wxPyMenu instance>"
class wxPyMenu(wxPyMenuPtr):
def __init__(self,*args) :
self.this = apply(windowsc.new_wxPyMenu,()+args)
self.thisown = 1
class wxMenuBarPtr(wxEvtHandlerPtr):
def __init__(self,this):
self.this = this

110
utils/wxPython/src/msw/windows2.cpp
View File

@@ -1082,6 +1082,58 @@ static PyObject *_wrap_wxGrid_GetDefCellBackgroundColour(PyObject *self, PyObjec
return _resultobj;
}
static PyObject * wxGrid_GetCells(wxGrid *self) {
int row, col;
PyObject* rows = PyList_New(0);
for (row=0; row < self->GetRows(); row++) {
PyObject* rowList = PyList_New(0);
for (col=0; col < self->GetCols(); col++) {
wxGridCell* cell = self->GetCell(row, col);
#ifdef WXP_WITH_THREAD
PyEval_RestoreThread(wxPyEventThreadState);
wxPyInEvent = true;
#endif
PyObject* pyCell = wxPyConstructObject(cell, "wxGridCell");
#ifdef WXP_WITH_THREAD
PyEval_SaveThread();
wxPyInEvent = false;
#endif
if (PyList_Append(rowList, pyCell) == -1)
return NULL;
}
if (PyList_Append(rows, rowList) == -1)
return NULL;
}
return rows;
}
static PyObject *_wrap_wxGrid_GetCells(PyObject *self, PyObject *args) {
PyObject * _resultobj;
PyObject * _result;
wxGrid * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxGrid_GetCells",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetCells. Expected _wxGrid_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (PyObject *)wxGrid_GetCells(_arg0);
wxPy_END_ALLOW_THREADS;
}{
_resultobj = _result;
}
return _resultobj;
}
#define wxGrid_GetCellTextColour(_swigobj,_swigarg0,_swigarg1) (_swigobj->GetCellTextColour(_swigarg0,_swigarg1))
static PyObject *_wrap_wxGrid_GetCellTextColour(PyObject *self, PyObject *args) {
PyObject * _resultobj;
@@ -2475,6 +2527,57 @@ static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args) {
return _resultobj;
}
#define wxGrid_GetEditInPlace(_swigobj) (_swigobj->GetEditInPlace())
static PyObject *_wrap_wxGrid_GetEditInPlace(PyObject *self, PyObject *args) {
PyObject * _resultobj;
bool _result;
wxGrid * _arg0;
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s:wxGrid_GetEditInPlace",&_argc0))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_GetEditInPlace. Expected _wxGrid_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (bool )wxGrid_GetEditInPlace(_arg0);
wxPy_END_ALLOW_THREADS;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxGrid_SetEditInPlace(_swigobj,_swigarg0) (_swigobj->SetEditInPlace(_swigarg0))
static PyObject *_wrap_wxGrid_SetEditInPlace(PyObject *self, PyObject *args) {
PyObject * _resultobj;
wxGrid * _arg0;
int _arg1 = (1);
char * _argc0 = 0;
self = self;
if(!PyArg_ParseTuple(args,"s|i:wxGrid_SetEditInPlace",&_argc0,&_arg1))
return NULL;
if (_argc0) {
if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_SetEditInPlace. Expected _wxGrid_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxGrid_SetEditInPlace(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxGridEventTowxEvent(void *ptr) {
wxGridEvent *src;
wxEvent *dest;
@@ -4496,6 +4599,8 @@ static PyMethodDef windows2cMethods[] = {
{ "wxGridEvent_m_col_set", _wrap_wxGridEvent_m_col_set, 1 },
{ "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, 1 },
{ "wxGridEvent_m_row_set", _wrap_wxGridEvent_m_row_set, 1 },
{ "wxGrid_SetEditInPlace", _wrap_wxGrid_SetEditInPlace, 1 },
{ "wxGrid_GetEditInPlace", _wrap_wxGrid_GetEditInPlace, 1 },
{ "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, 1 },
{ "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, 1 },
{ "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, 1 },
@@ -4544,6 +4649,7 @@ static PyMethodDef windows2cMethods[] = {
{ "wxGrid_GetCellTextFont", _wrap_wxGrid_GetCellTextFont, 1 },
{ "wxGrid_GetDefCellTextColour", _wrap_wxGrid_GetDefCellTextColour, 1 },
{ "wxGrid_GetCellTextColour", _wrap_wxGrid_GetCellTextColour, 1 },
{ "wxGrid_GetCells", _wrap_wxGrid_GetCells, 1 },
{ "wxGrid_GetDefCellBackgroundColour", _wrap_wxGrid_GetDefCellBackgroundColour, 1 },
{ "wxGrid_GetCellBackgroundColour", _wrap_wxGrid_GetCellBackgroundColour, 1 },
{ "wxGrid_GetDefCellAlignment", _wrap_wxGrid_GetDefCellAlignment, 1 },
@@ -4647,7 +4753,6 @@ SWIGEXPORT(void,initwindows2c)() {
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -4689,6 +4794,7 @@ SWIGEXPORT(void,initwindows2c)() {
SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0);
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
SWIG_RegisterMapping("_wxShowEvent","_class_wxShowEvent",0);
@@ -4730,6 +4836,7 @@ SWIGEXPORT(void,initwindows2c)() {
SWIG_RegisterMapping("_class_wxPyEvent","_wxPyEvent",0);
SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0);
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
SWIG_RegisterMapping("_EBool","_signed_int",0);
@@ -4817,7 +4924,6 @@ SWIGEXPORT(void,initwindows2c)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);
SWIG_RegisterMapping("_short","_unsigned_short",0);

13
utils/wxPython/src/msw/windows2.py
View File

@@ -15,7 +15,7 @@ class wxGridCellPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, windows2c=windows2c):
if self.thisown == 1 :
windows2c.delete_wxGridCell(self.this)
def GetTextValue(self):
@@ -127,6 +127,9 @@ class wxGridPtr(wxPanelPtr):
val = windows2c.wxGrid_GetDefCellBackgroundColour(self.this)
val = wxColourPtr(val)
return val
def GetCells(self):
val = windows2c.wxGrid_GetCells(self.this)
return val
def GetCellTextColour(self,arg0,arg1):
val = windows2c.wxGrid_GetCellTextColour(self.this,arg0,arg1)
val = wxColourPtr(val)
@@ -283,6 +286,12 @@ class wxGridPtr(wxPanelPtr):
def UpdateDimensions(self):
val = windows2c.wxGrid_UpdateDimensions(self.this)
return val
def GetEditInPlace(self):
val = windows2c.wxGrid_GetEditInPlace(self.this)
return val
def SetEditInPlace(self,*args):
val = apply(windows2c.wxGrid_SetEditInPlace,(self.this,)+args)
return val
def __repr__(self):
return "<C wxGrid instance>"
class wxGrid(wxGridPtr):
@@ -574,7 +583,7 @@ class wxTaskBarIconPtr(wxEvtHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, windows2c=windows2c):
if self.thisown == 1 :
windows2c.delete_wxTaskBarIcon(self.this)
def SetIcon(self,arg0,*args):

4
utils/wxPython/src/msw/windows3.cpp
View File

@@ -1674,7 +1674,6 @@ SWIGEXPORT(void,initwindows3c)() {
SWIG_RegisterMapping("_wxNotifyEvent","_class_wxNotifyEvent",0);
SWIG_RegisterMapping("_wxMask","_class_wxMask",0);
SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0);
SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0);
SWIG_RegisterMapping("_wxPen","_class_wxPen",0);
SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_byte","_unsigned_char",0);
@@ -1721,6 +1720,7 @@ SWIGEXPORT(void,initwindows3c)() {
SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0);
SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0);
SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0);
SWIG_RegisterMapping("_wxStaticLine","_class_wxStaticLine",0);
SWIG_RegisterMapping("_class_wxLayoutAlgorithm","_wxLayoutAlgorithm",0);
SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0);
SWIG_RegisterMapping("_class_wxNotebookEvent","_wxNotebookEvent",0);
@@ -1767,6 +1767,7 @@ SWIGEXPORT(void,initwindows3c)() {
SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0);
SWIG_RegisterMapping("_wxMDIChildFrame","_class_wxMDIChildFrame",0);
SWIG_RegisterMapping("_class_wxToolBar","_wxToolBar",0);
SWIG_RegisterMapping("_class_wxStaticLine","_wxStaticLine",0);
SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0);
SWIG_RegisterMapping("_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0);
SWIG_RegisterMapping("_EBool","_wxPrintQuality",0);
@@ -1855,7 +1856,6 @@ SWIGEXPORT(void,initwindows3c)() {
SWIG_RegisterMapping("_unsigned_int","_int",0);
SWIG_RegisterMapping("_wxIcon","_class_wxIcon",0);
SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0);
SWIG_RegisterMapping("_class_wxPyMenu","_wxPyMenu",0);
SWIG_RegisterMapping("_class_wxPen","_wxPen",0);
SWIG_RegisterMapping("_wxQueryLayoutInfoEvent","_class_wxQueryLayoutInfoEvent",0);
SWIG_RegisterMapping("_short","_WXTYPE",0);

2
utils/wxPython/src/msw/windows3.py
View File

@@ -238,7 +238,7 @@ class wxLayoutAlgorithmPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self):
def __del__(self, windows3c=windows3c):
if self.thisown == 1 :
windows3c.delete_wxLayoutAlgorithm(self.this)
def LayoutMDIFrame(self,arg0,*args):

873
utils/wxPython/src/msw/wx.cpp
View File

File diff suppressed because it is too large Load Diff

98
utils/wxPython/src/msw/wx.py
View File

@@ -34,6 +34,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self, wxc=wxc):
if self.thisown == 1 :
wxc.delete_wxPyApp(self.this)
def GetAppName(self):
val = wxc.wxPyApp_GetAppName(self.this)
return val
@@ -71,6 +74,9 @@ class wxPyAppPtr(wxEvtHandlerPtr):
def Pending(self):
val = wxc.wxPyApp_Pending(self.this)
return val
def ProcessIdle(self):
val = wxc.wxPyApp_ProcessIdle(self.this)
return val
def SetAppName(self,arg0):
val = wxc.wxPyApp_SetAppName(self.this,arg0)
return val
@@ -92,8 +98,10 @@ class wxPyAppPtr(wxEvtHandlerPtr):
def SetVendorName(self,arg0):
val = wxc.wxPyApp_SetVendorName(self.this,arg0)
return val
def AfterMainLoop(self):
val = wxc.wxPyApp_AfterMainLoop(self.this)
def GetStdIcon(self,arg0):
val = wxc.wxPyApp_GetStdIcon(self.this,arg0)
val = wxIconPtr(val)
val.thisown = 1
return val
def __repr__(self):
return "<C wxPyApp instance>"
@@ -105,10 +113,41 @@ class wxPyApp(wxPyAppPtr):
class __wxPyCleanupPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self, wxc=wxc):
if self.thisown == 1 :
wxc.delete___wxPyCleanup(self.this)
def __repr__(self):
return "<C __wxPyCleanup instance>"
class __wxPyCleanup(__wxPyCleanupPtr):
def __init__(self) :
self.this = wxc.new___wxPyCleanup()
self.thisown = 1
#-------------- FUNCTION WRAPPERS ------------------
ptrcast = wxc.ptrcast
ptrvalue = wxc.ptrvalue
ptrset = wxc.ptrset
ptrcreate = wxc.ptrcreate
ptrfree = wxc.ptrfree
ptradd = wxc.ptradd
ptrmap = wxc.ptrmap
_wxStart = wxc._wxStart
_wxSetDictionary = wxc._wxSetDictionary
@@ -183,6 +222,7 @@ wxPASSWORD = wxc.wxPASSWORD
wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
wxTE_PASSWORD = wxc.wxTE_PASSWORD
wxTE_READONLY = wxc.wxTE_READONLY
wxTE_RICH = wxc.wxTE_RICH
wxTE_MULTILINE = wxc.wxTE_MULTILINE
wxCB_SIMPLE = wxc.wxCB_SIMPLE
wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
@@ -215,6 +255,8 @@ wxBU_NOAUTODRAW = wxc.wxBU_NOAUTODRAW
wxTR_HAS_BUTTONS = wxc.wxTR_HAS_BUTTONS
wxTR_EDIT_LABELS = wxc.wxTR_EDIT_LABELS
wxTR_LINES_AT_ROOT = wxc.wxTR_LINES_AT_ROOT
wxTR_MULTIPLE = wxc.wxTR_MULTIPLE
wxTR_HAS_VARIABLE_ROW_HEIGHT = wxc.wxTR_HAS_VARIABLE_ROW_HEIGHT
wxLC_ICON = wxc.wxLC_ICON
wxLC_SMALL_ICON = wxc.wxLC_SMALL_ICON
wxLC_LIST = wxc.wxLC_LIST
@@ -349,6 +391,8 @@ wxPD_ELAPSED_TIME = wxc.wxPD_ELAPSED_TIME
wxPD_ESTIMATED_TIME = wxc.wxPD_ESTIMATED_TIME
wxPD_REMAINING_TIME = wxc.wxPD_REMAINING_TIME
wxNO_DEFAULT = wxc.wxNO_DEFAULT
wxMENU_TEAROFF = wxc.wxMENU_TEAROFF
wxNO_FULL_REPAINT_ON_RESIZE = wxc.wxNO_FULL_REPAINT_ON_RESIZE
wxDEFAULT = wxc.wxDEFAULT
wxDECORATIVE = wxc.wxDECORATIVE
wxROMAN = wxc.wxROMAN
@@ -624,6 +668,9 @@ wxEVT_NC_LEFT_DCLICK = wxc.wxEVT_NC_LEFT_DCLICK
wxEVT_NC_MIDDLE_DCLICK = wxc.wxEVT_NC_MIDDLE_DCLICK
wxEVT_NC_RIGHT_DCLICK = wxc.wxEVT_NC_RIGHT_DCLICK
wxEVT_CHAR = wxc.wxEVT_CHAR
wxEVT_KEY_DOWN = wxc.wxEVT_KEY_DOWN
wxEVT_KEY_UP = wxc.wxEVT_KEY_UP
wxEVT_CHAR_HOOK = wxc.wxEVT_CHAR_HOOK
wxEVT_SCROLL_TOP = wxc.wxEVT_SCROLL_TOP
wxEVT_SCROLL_BOTTOM = wxc.wxEVT_SCROLL_BOTTOM
wxEVT_SCROLL_LINEUP = wxc.wxEVT_SCROLL_LINEUP
@@ -645,8 +692,6 @@ wxEVT_END_SESSION = wxc.wxEVT_END_SESSION
wxEVT_QUERY_END_SESSION = wxc.wxEVT_QUERY_END_SESSION
wxEVT_ACTIVATE_APP = wxc.wxEVT_ACTIVATE_APP
wxEVT_POWER = wxc.wxEVT_POWER
wxEVT_CHAR_HOOK = wxc.wxEVT_CHAR_HOOK
wxEVT_KEY_UP = wxc.wxEVT_KEY_UP
wxEVT_ACTIVATE = wxc.wxEVT_ACTIVATE
wxEVT_CREATE = wxc.wxEVT_CREATE
wxEVT_DESTROY = wxc.wxEVT_DESTROY
@@ -826,6 +871,12 @@ def EVT_CHAR(win, func):
def EVT_CHAR_HOOK(win, func):
win.Connect(-1, -1, wxEVT_CHAR_HOOK, func)
def EVT_KEY_DOWN(win, func):
win.Connect(-1, -1, wxEVT_KEY_DOWN, func)
def EVT_KEY_UP(win, func):
win.Connect(-1, -1, wxEVT_KEY_UP, func)
def EVT_MENU_HIGHLIGHT(win, id, func):
win.Connect(id, -1, wxEVT_MENU_HIGHLIGHT, func)
@@ -1317,6 +1368,38 @@ class wxAcceleratorTable(wxAcceleratorTablePtr):
self.this = miscc.new_wxAcceleratorTable(arg0)
self.thisown = 1
#----------------------------------------------------------------------
# This helper function will take a wxPython object and convert it to
# another wxPython object type. This will not be able to create objects
# user that are derived from wxPython classes, only those that are
# actually part of wxPython and directly corespond to C++ objects.
#
# This is useful in situations where some method returns a generic
# type such as wxWindow, but you know that it is actually some
# derived type such as a wxTextCtrl. You can't call wxTextCtrl specific
# methods on a wxWindow object, but you can use this function to
# create a wxTextCtrl object that will pass the same pointer to
# the C++ code. You use it like this:
#
# textCtrl = wxPyTypeCast(window, "wxTextCtrl")
#
#
# WARNING: Using this function to type cast objects into types that
# they are not is not recommended and is likely to cause your
# program to crash... Hard.
#
def wxPyTypeCast(obj, typeStr):
if hasattr(obj, "this"):
newPtr = ptrcast(obj.this, typeStr+"_p")
else:
newPtr = ptrcast(obj, typeStr+"_p")
theClass = globals()[typeStr+"Ptr"]
theObj = theClass(newPtr)
theObj.thisown = obj.thisown
return theObj
#----------------------------------------------------------------------
## class wxPyStdOutWindow:
@@ -1385,3 +1468,10 @@ class wxApp(wxPyApp):
#----------------------------------------------------------------------------
# DO NOT hold any other references to this object. This is how we know when
# to cleanup system resources that wxWin is holding...
__cleanMeUp = __wxPyCleanup()
#----------------------------------------------------------------------------