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

New toolbar wrappers

Browse Source 
wxMask demos
GenericButton now derives from wxControl
Lots of small changes.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5086 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
1999-12-23 20:05:08 +00:00
parent 8d772832a0
commit 9b3d3bc44b
42 changed files with 4249 additions and 2442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/wxPython/src/.cvsignore
View File

@@ -16,10 +16,12 @@ make.bat
makefile.test
sedscript
templates
tests___Win32_Debug
transfer.zip
utilsc.exp
vc50.pdb
vc60.pdb
wx.py
wxPython.001
wxPython.dsp
wxPython.dsw

1
utils/wxPython/src/_defs.i
View File

@@ -423,6 +423,7 @@ enum {
wxBITMAP_TYPE_ANY,
wxBITMAP_TYPE_RESOURCE,
wxBITMAP_TYPE_JPEG,
wxBITMAP_TYPE_PCX,
wxOPEN,
wxSAVE,

42
utils/wxPython/src/controls.i
View File

@@ -60,44 +60,22 @@ wxValidator wxDefaultValidator;
class wxControl : public wxWindow {
public:
wxControl();
wxControl(wxWindow *parent,
wxWindowID id,
const wxPoint& pos=wxPyDefaultPosition,
const wxSize& size=wxPyDefaultSize,
long style=0,
const wxValidator& validator=wxPyDefaultValidator,
const char* name="control");
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
#ifdef __WXMSW__
void Command(wxCommandEvent& event);
#endif
wxString GetLabel();
void SetLabel(const wxString& label);
};
// %{
// class wxPyControl : public wxControl {
// public:
// wxPyControl(wxWindow *parent,
// wxWindowID id,
// const wxPoint& pos,
// const wxSize& size,
// long style,
// const wxValidator& validator,
// const wxString& name)
// : wxControl() {
// CreateControl(parent, id, pos, size, style, validator, name);
// }
// };
// %}
// class wxPyControl : public wxControl {
// public:
// wxPyControl(wxWindow* parent, wxWindowID id,
// const wxPoint& pos = wxPyDefaultPosition,
// const wxSize& size = wxPyDefaultSize,
// long style = 0,
// const wxValidator& validator = wxPyDefaultValidator,
// char* name = "control");
// };
//----------------------------------------------------------------------
class wxButton : public wxControl {
@@ -112,6 +90,8 @@ public:
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
void SetDefault();
void SetBackgroundColour(const wxColour& colour);
void SetForegroundColour(const wxColour& colour);
};

4
utils/wxPython/src/gdi.i
View File

@@ -301,6 +301,10 @@ public:
return rv;
}
}
%pragma(python) addtoclass = "asTuple = Get"
%pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
%pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
};
%new wxColour* wxNamedColour(const wxString& colorName);

33
utils/wxPython/src/helpers.h
View File

@@ -71,6 +71,20 @@ HELPEREXPORT bool wxPyRestoreThread();
HELPEREXPORT void wxPySaveThread(bool doSave);
HELPEREXPORT PyObject* wxPy_ConvertList(wxListBase* list, const char* className);
//----------------------------------------------------------------------
class wxPyUserData : public wxObject {
public:
wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); }
~wxPyUserData() {
bool doSave = wxPyRestoreThread();
Py_DECREF(m_obj);
wxPySaveThread(doSave);
}
PyObject* m_obj;
};
//----------------------------------------------------------------------
// These are helpers used by the typemaps
@@ -122,19 +136,6 @@ public:
PyObject* m_func;
};
//---------------------------------------------------------------------------
// class wxPyMenu : public wxMenu {
// public:
// wxPyMenu(const wxString& title = "", PyObject* func=NULL);
// ~wxPyMenu();
// private:
// static void MenuCallback(wxMenu& menu, wxCommandEvent& evt);
// PyObject* func;
// };
//---------------------------------------------------------------------------
class wxPyTimer : public wxTimer {
@@ -185,9 +186,9 @@ private:
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
// These classes can be derived from in Python and passed through the event
// system without loosing anything. They do this by keeping a reference to
// themselves and some special case handling in wxPyCallback::EventThunker.
// These Event classes can be derived from in Python and passed through the
// event system without loosing anything. They do this by keeping a reference
// to themselves and some special case handling in wxPyCallback::EventThunker.
class wxPyEvtSelfRef {

6
utils/wxPython/src/image.i
View File

@@ -82,6 +82,12 @@ public:
wxPCXHandler();
};
class wxTIFFHandler : public wxImageHandler {
public:
wxTIFFHandler();
};
//---------------------------------------------------------------------------
class wxImage {

39
utils/wxPython/src/misc.i
View File

@@ -156,6 +156,45 @@ public:
}
%pragma(python) addtoclass = "def __str__(self): return str(self.asTuple())"
%pragma(python) addtoclass = "def __repr__(self): return str(self.asTuple())"
%pragma(python) addtoclass = "
# override the __getattr__ made by SWIG
def __getattr__(self, name):
d = {
'x' : miscc.wxRect_x_get,
'y' : miscc.wxRect_y_get,
'width' : miscc.wxRect_width_get,
'height' : miscc.wxRect_height_get,
'top' : miscc.wxRect_GetTop,
'bottom' : miscc.wxRect_GetBottom,
'left' : miscc.wxRect_GetLeft,
'right' : miscc.wxRect_GetRight,
}
try:
func = d[name]
except KeyError:
raise AttributeError,name
return func(self)
# and also the __setattr__
def __setattr__(self, name, value):
d = {
'x' : miscc.wxRect_x_set,
'y' : miscc.wxRect_y_set,
'width' : miscc.wxRect_width_set,
'height' : miscc.wxRect_height_set,
'top' : miscc.wxRect_SetTop,
'bottom' : miscc.wxRect_SetBottom,
'left' : miscc.wxRect_SetLeft,
'right' : miscc.wxRect_SetRight,
}
try:
func = d[name]
except KeyError:
self.__dict__[name] = value
return
func(self, value)
"
};

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

@@ -3445,7 +3445,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_EBool","_wxWindowID",0},
{ "_class_wxRegion","_wxRegion",0},
{ "_class_wxDataFormat","_wxDataFormat",0},
{ "_wxGDIImage","_class_wxGDIImage",0},
{ "_wxFont","_class_wxFont",0},
{ "_class_wxPyDropTarget","_class_wxPyFileDropTarget",SwigwxPyFileDropTargetTowxPyDropTarget},
{ "_class_wxPyDropTarget","_wxPyFileDropTarget",SwigwxPyFileDropTargetTowxPyDropTarget},
@@ -3514,7 +3513,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
{ "_class_wxPyDropSource","_wxPyDropSource",0},
{ "_class_wxImageList","_wxImageList",0},
{ "_class_wxGDIImage","_wxGDIImage",0},
{ "_wxWindowID","_wxCoord",0},
{ "_wxWindowID","_wxPrintQuality",0},
{ "_wxWindowID","_size_t",0},

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

@@ -2719,6 +2719,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_wxMask","_class_wxMask",0},
{ "_class_wxColourData","_wxColourData",0},
{ "_wxPen","_class_wxPen",0},
@@ -2829,7 +2830,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxToolBarTool","_class_wxToolBarTool",0},
{ "_wxColourDialog","_class_wxColourDialog",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
{ "_class_wxNotifyEvent","_wxNotifyEvent",0},
@@ -2839,10 +2839,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
@@ -2902,6 +2904,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},
@@ -2951,7 +2954,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxToolBarTool","_wxToolBarTool",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
@@ -3035,6 +3037,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
{ "_class_wxControl","_wxControl",0},
@@ -3105,6 +3108,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxFileDataObject","_class_wxFileDataObject",0},
{ "_class_wxEraseEvent","_wxEraseEvent",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_class_wxFontDialog","_wxFontDialog",0},
{ "_wxWindow","_class_wxProgressDialog",SwigwxProgressDialogTowxWindow},
{ "_wxWindow","_wxProgressDialog",SwigwxProgressDialogTowxWindow},

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

@@ -178,19 +178,58 @@ static void *SwigwxControlTowxEvtHandler(void *ptr) {
return (void *) dest;
}
#define new_wxControl() (new wxControl())
#define new_wxControl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxControl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6))
static PyObject *_wrap_new_wxControl(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxControl * _result;
char *_kwnames[] = { NULL };
wxWindow * _arg0;
wxWindowID _arg1;
wxPoint * _arg2 = (wxPoint *) &wxPyDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxPyDefaultSize;
long _arg4 = (long ) 0;
wxValidator * _arg5 = (wxValidator *) &wxPyDefaultValidator;
char * _arg6 = (char *) "control";
PyObject * _argo0 = 0;
wxPoint temp;
PyObject * _obj2 = 0;
wxSize temp0;
PyObject * _obj3 = 0;
PyObject * _argo5 = 0;
char *_kwnames[] = { "parent","id","pos","size","style","validator","name", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxControl",_kwnames))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOlOs:new_wxControl",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_argo5,&_arg6))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWindow_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxControl. Expected _wxWindow_p.");
return NULL;
}
}
if (_obj2)
{
_arg2 = &temp;
if (! wxPoint_helper(_obj2, &_arg2))
return NULL;
}
if (_obj3)
{
_arg3 = &temp0;
if (! wxSize_helper(_obj3, &_arg3))
return NULL;
}
if (_argo5) {
if (_argo5 == Py_None) { _arg5 = NULL; }
else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxValidator_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxControl. Expected _wxValidator_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxControl *)new_wxControl();
_result = (wxControl *)new_wxControl(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6);
wxPy_END_ALLOW_THREADS;
} if (_result) {
@@ -439,6 +478,78 @@ static PyObject *_wrap_wxButton_SetDefault(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
#define wxButton_SetBackgroundColour(_swigobj,_swigarg0) (_swigobj->SetBackgroundColour(_swigarg0))
static PyObject *_wrap_wxButton_SetBackgroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxButton * _arg0;
wxColour * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","colour", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxButton_SetBackgroundColour",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxButton_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxButton_SetBackgroundColour. Expected _wxButton_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxButton_SetBackgroundColour. Expected _wxColour_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxButton_SetBackgroundColour(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxButton_SetForegroundColour(_swigobj,_swigarg0) (_swigobj->SetForegroundColour(_swigarg0))
static PyObject *_wrap_wxButton_SetForegroundColour(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxButton * _arg0;
wxColour * _arg1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","colour", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxButton_SetForegroundColour",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxButton_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxButton_SetForegroundColour. Expected _wxButton_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxColour_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxButton_SetForegroundColour. Expected _wxColour_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxButton_SetForegroundColour(_arg0,*_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxBitmapButtonTowxButton(void *ptr) {
wxBitmapButton *src;
wxButton *dest;
@@ -7219,6 +7330,8 @@ static PyMethodDef controlscMethods[] = {
{ "wxBitmapButton_GetBitmapDisabled", (PyCFunction) _wrap_wxBitmapButton_GetBitmapDisabled, METH_VARARGS | METH_KEYWORDS },
{ "wxBitmapButton_GetBitmapLabel", (PyCFunction) _wrap_wxBitmapButton_GetBitmapLabel, METH_VARARGS | METH_KEYWORDS },
{ "new_wxBitmapButton", (PyCFunction) _wrap_new_wxBitmapButton, METH_VARARGS | METH_KEYWORDS },
{ "wxButton_SetForegroundColour", (PyCFunction) _wrap_wxButton_SetForegroundColour, METH_VARARGS | METH_KEYWORDS },
{ "wxButton_SetBackgroundColour", (PyCFunction) _wrap_wxButton_SetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
{ "wxButton_SetDefault", (PyCFunction) _wrap_wxButton_SetDefault, METH_VARARGS | METH_KEYWORDS },
{ "new_wxButton", (PyCFunction) _wrap_new_wxButton, METH_VARARGS | METH_KEYWORDS },
{ "wxControl_SetLabel", (PyCFunction) _wrap_wxControl_SetLabel, METH_VARARGS | METH_KEYWORDS },
@@ -7395,7 +7508,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxDataFormat","_wxDataFormat",0},
{ "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
{ "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
{ "_wxGDIImage","_class_wxGDIImage",0},
{ "_wxStaticText","_class_wxStaticText",0},
{ "_wxFont","_class_wxFont",0},
{ "_class_wxPyDropTarget","_wxPyDropTarget",0},
@@ -7569,7 +7681,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxSlider","_wxSlider",0},
{ "_class_wxImageList","_wxImageList",0},
{ "_class_wxBitmapButton","_wxBitmapButton",0},
{ "_class_wxGDIImage","_wxGDIImage",0},
{ "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
{ "_wxWindowID","_wxCoord",0},
{ "_wxWindowID","_wxPrintQuality",0},

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

@@ -30,6 +30,7 @@ class wxControl(wxControlPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(controlsc.new_wxControl,_args,_kwargs)
self.thisown = 1
wx._StdWindowCallbacks(self)
@@ -41,6 +42,12 @@ class wxButtonPtr(wxControlPtr):
def SetDefault(self, *_args, **_kwargs):
val = apply(controlsc.wxButton_SetDefault,(self,) + _args, _kwargs)
return val
def SetBackgroundColour(self, *_args, **_kwargs):
val = apply(controlsc.wxButton_SetBackgroundColour,(self,) + _args, _kwargs)
return val
def SetForegroundColour(self, *_args, **_kwargs):
val = apply(controlsc.wxButton_SetForegroundColour,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxButton instance at %s>" % (self.this,)
class wxButton(wxButtonPtr):

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

@@ -6178,7 +6178,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxDataFormat","_wxDataFormat",0},
{ "_class_wxDropFilesEvent","_wxDropFilesEvent",0},
{ "_wxWindowDestroyEvent","_class_wxWindowDestroyEvent",0},
{ "_wxGDIImage","_class_wxGDIImage",0},
{ "_wxStaticText","_class_wxStaticText",0},
{ "_wxFont","_class_wxFont",0},
{ "_class_wxPyDropTarget","_wxPyDropTarget",0},
@@ -6284,7 +6283,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxSlider","_wxSlider",0},
{ "_class_wxImageList","_wxImageList",0},
{ "_class_wxBitmapButton","_wxBitmapButton",0},
{ "_class_wxGDIImage","_wxGDIImage",0},
{ "_class_wxPaletteChangedEvent","_wxPaletteChangedEvent",0},
{ "_wxWindowID","_wxCoord",0},
{ "_wxWindowID","_wxPrintQuality",0},

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

@@ -1004,6 +1004,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_wxMask","_class_wxMask",0},
{ "_wxPen","_class_wxPen",0},
{ "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
@@ -1082,17 +1083,18 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxToolBarTool","_class_wxToolBarTool",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
{ "_class_wxNotifyEvent","_wxNotifyEvent",0},
{ "_class_wxValidator","_wxValidator",0},
{ "_class_wxPyEvent","_wxPyEvent",0},
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
@@ -1135,6 +1137,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},
@@ -1170,7 +1173,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxToolBarTool","_wxToolBarTool",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
@@ -1239,6 +1241,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
{ "_class_wxControl","_wxControl",0},
@@ -1292,6 +1295,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxFileDataObject","_class_wxFileDataObject",0},
{ "_class_wxEraseEvent","_wxEraseEvent",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_wxWindow","_class_wxMiniFrame",SwigwxMiniFrameTowxWindow},
{ "_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow},
{ "_wxWindow","_class_wxFrame",SwigwxFrameTowxWindow},

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

File diff suppressed because it is too large Load Diff

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

@@ -2,50 +2,7 @@
import gdic
from misc import *
class wxGDIImagePtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def GetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_GetHandle,(self,) + _args, _kwargs)
return val
def SetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_SetHandle,(self,) + _args, _kwargs)
return val
def Ok(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_Ok,(self,) + _args, _kwargs)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_GetWidth,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_GetHeight,(self,) + _args, _kwargs)
return val
def GetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_GetDepth,(self,) + _args, _kwargs)
return val
def SetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_SetWidth,(self,) + _args, _kwargs)
return val
def SetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_SetHeight,(self,) + _args, _kwargs)
return val
def SetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_SetDepth,(self,) + _args, _kwargs)
return val
def SetSize(self, *_args, **_kwargs):
val = apply(gdic.wxGDIImage_SetSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxGDIImage instance at %s>" % (self.this,)
class wxGDIImage(wxGDIImagePtr):
def __init__(self,this):
self.this = this
class wxBitmapPtr(wxGDIImagePtr):
class wxBitmapPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -72,6 +29,36 @@ class wxBitmapPtr(wxGDIImagePtr):
def SetPalette(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_SetPalette,(self,) + _args, _kwargs)
return val
def GetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_GetHandle,(self,) + _args, _kwargs)
return val
def SetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_SetHandle,(self,) + _args, _kwargs)
return val
def Ok(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_Ok,(self,) + _args, _kwargs)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_GetWidth,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_GetHeight,(self,) + _args, _kwargs)
return val
def GetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_GetDepth,(self,) + _args, _kwargs)
return val
def SetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_SetWidth,(self,) + _args, _kwargs)
return val
def SetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_SetHeight,(self,) + _args, _kwargs)
return val
def SetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_SetDepth,(self,) + _args, _kwargs)
return val
def SetSize(self, *_args, **_kwargs):
val = apply(gdic.wxBitmap_SetSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxBitmap instance at %s>" % (self.this,)
class wxBitmap(wxBitmapPtr):
@@ -96,7 +83,7 @@ class wxMask(wxMaskPtr):
class wxIconPtr(wxGDIImagePtr):
class wxIconPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -106,6 +93,36 @@ class wxIconPtr(wxGDIImagePtr):
def LoadFile(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_LoadFile,(self,) + _args, _kwargs)
return val
def GetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_GetHandle,(self,) + _args, _kwargs)
return val
def SetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_SetHandle,(self,) + _args, _kwargs)
return val
def Ok(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_Ok,(self,) + _args, _kwargs)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_GetWidth,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_GetHeight,(self,) + _args, _kwargs)
return val
def GetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_GetDepth,(self,) + _args, _kwargs)
return val
def SetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_SetWidth,(self,) + _args, _kwargs)
return val
def SetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_SetHeight,(self,) + _args, _kwargs)
return val
def SetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_SetDepth,(self,) + _args, _kwargs)
return val
def SetSize(self, *_args, **_kwargs):
val = apply(gdic.wxIcon_SetSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxIcon instance at %s>" % (self.this,)
class wxIcon(wxIconPtr):
@@ -116,13 +133,43 @@ class wxIcon(wxIconPtr):
class wxCursorPtr(wxGDIImagePtr):
class wxCursorPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,gdic=gdic):
if self.thisown == 1 :
gdic.delete_wxCursor(self)
def GetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_GetHandle,(self,) + _args, _kwargs)
return val
def SetHandle(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_SetHandle,(self,) + _args, _kwargs)
return val
def Ok(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_Ok,(self,) + _args, _kwargs)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_GetWidth,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_GetHeight,(self,) + _args, _kwargs)
return val
def GetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_GetDepth,(self,) + _args, _kwargs)
return val
def SetWidth(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_SetWidth,(self,) + _args, _kwargs)
return val
def SetHeight(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_SetHeight,(self,) + _args, _kwargs)
return val
def SetDepth(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_SetDepth,(self,) + _args, _kwargs)
return val
def SetSize(self, *_args, **_kwargs):
val = apply(gdic.wxCursor_SetSize,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxCursor instance at %s>" % (self.this,)
class wxCursor(wxCursorPtr):
@@ -231,6 +278,9 @@ class wxColourPtr :
return val
def __repr__(self):
return "<C wxColour instance at %s>" % (self.this,)
asTuple = Get
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
class wxColour(wxColourPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(gdic.new_wxColour,_args,_kwargs)

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

@@ -772,6 +772,39 @@ static PyObject *_wrap_new_wxPCXHandler(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static void *SwigwxTIFFHandlerTowxImageHandler(void *ptr) {
wxTIFFHandler *src;
wxImageHandler *dest;
src = (wxTIFFHandler *) ptr;
dest = (wxImageHandler *) src;
return (void *) dest;
}
#define new_wxTIFFHandler() (new wxTIFFHandler())
static PyObject *_wrap_new_wxTIFFHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxTIFFHandler * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxTIFFHandler",_kwnames))
return NULL;
{
wxPy_BEGIN_ALLOW_THREADS;
_result = (wxTIFFHandler *)new_wxTIFFHandler();
wxPy_END_ALLOW_THREADS;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxTIFFHandler_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
#define new_wxImage(_swigarg0,_swigarg1) (new wxImage(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxImage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1681,6 +1714,7 @@ static PyMethodDef imagecMethods[] = {
{ "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxImage", (PyCFunction) _wrap_delete_wxImage, METH_VARARGS | METH_KEYWORDS },
{ "new_wxImage", (PyCFunction) _wrap_new_wxImage, METH_VARARGS | METH_KEYWORDS },
{ "new_wxTIFFHandler", (PyCFunction) _wrap_new_wxTIFFHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPCXHandler", (PyCFunction) _wrap_new_wxPCXHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPNMHandler", (PyCFunction) _wrap_new_wxPNMHandler, METH_VARARGS | METH_KEYWORDS },
{ "new_wxGIFHandler", (PyCFunction) _wrap_new_wxGIFHandler, METH_VARARGS | METH_KEYWORDS },
@@ -1727,6 +1761,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxGIFHandler","_class_wxGIFHandler",0},
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxImageHandler","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler},
{ "_wxImageHandler","_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler},
{ "_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
@@ -1748,6 +1784,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_long","_unsigned_long",0},
{ "_long","_signed_long",0},
{ "_wxImageList","_class_wxImageList",0},
{ "_class_wxTIFFHandler","_wxTIFFHandler",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_wxDC","_class_wxDC",0},
{ "_class_wxBMPHandler","_wxBMPHandler",0},
@@ -1818,6 +1855,8 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxWindowDC","_wxWindowDC",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_class_wxImageHandler","_class_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler},
{ "_class_wxImageHandler","_wxTIFFHandler",SwigwxTIFFHandlerTowxImageHandler},
{ "_class_wxImageHandler","_class_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_class_wxImageHandler","_wxPCXHandler",SwigwxPCXHandlerTowxImageHandler},
{ "_class_wxImageHandler","_class_wxPNMHandler",SwigwxPNMHandlerTowxImageHandler},
@@ -1882,6 +1921,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCoord","_wxPrintQuality",0},
{ "_wxRegion","_class_wxRegion",0},
{ "_class_wxPCXHandler","_wxPCXHandler",0},
{ "_wxTIFFHandler","_class_wxTIFFHandler",0},
{ "_class_wxBusyInfo","_wxBusyInfo",0},
{ "_class_wxClientDC","_wxClientDC",0},
{ "_class_wxSize","_wxSize",0},

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

@@ -125,6 +125,20 @@ class wxPCXHandler(wxPCXHandlerPtr):
class wxTIFFHandlerPtr(wxImageHandlerPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<C wxTIFFHandler instance at %s>" % (self.this,)
class wxTIFFHandler(wxTIFFHandlerPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(imagec.new_wxTIFFHandler,_args,_kwargs)
self.thisown = 1
class wxImagePtr :
def __init__(self,this):
self.this = this

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

@@ -754,6 +754,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_wxMask","_class_wxMask",0},
{ "_wxPen","_class_wxPen",0},
{ "_wxUpdateUIEvent","_class_wxUpdateUIEvent",0},
@@ -832,18 +833,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxToolBarTool","_class_wxToolBarTool",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
{ "_class_wxNotifyEvent","_wxNotifyEvent",0},
{ "_class_wxValidator","_wxValidator",0},
{ "_class_wxPyEvent","_wxPyEvent",0},
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
@@ -887,6 +889,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
@@ -926,7 +929,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxToolBarTool","_wxToolBarTool",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
@@ -998,6 +1000,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
{ "_class_wxControl","_wxControl",0},
@@ -1054,6 +1057,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxEraseEvent","_wxEraseEvent",0},
{ "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow},
{ "_wxWindow","_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow},
{ "_wxWindow","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxWindow},

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

@@ -239,6 +239,44 @@ class wxRectPtr :
return "<C wxRect instance at %s>" % (self.this,)
def __str__(self): return str(self.asTuple())
def __repr__(self): return str(self.asTuple())
# override the __getattr__ made by SWIG
def __getattr__(self, name):
d = {
'x' : miscc.wxRect_x_get,
'y' : miscc.wxRect_y_get,
'width' : miscc.wxRect_width_get,
'height' : miscc.wxRect_height_get,
'top' : miscc.wxRect_GetTop,
'bottom' : miscc.wxRect_GetBottom,
'left' : miscc.wxRect_GetLeft,
'right' : miscc.wxRect_GetRight,
}
try:
func = d[name]
except KeyError:
raise AttributeError,name
return func(self)
# and also the __setattr__
def __setattr__(self, name, value):
d = {
'x' : miscc.wxRect_x_set,
'y' : miscc.wxRect_y_set,
'width' : miscc.wxRect_width_set,
'height' : miscc.wxRect_height_set,
'top' : miscc.wxRect_SetTop,
'bottom' : miscc.wxRect_SetBottom,
'left' : miscc.wxRect_SetLeft,
'right' : miscc.wxRect_SetRight,
}
try:
func = d[name]
except KeyError:
self.__dict__[name] = value
return
func(self, value)
class wxRect(wxRectPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(miscc.new_wxRect,_args,_kwargs)

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

@@ -4376,6 +4376,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_wxMask","_class_wxMask",0},
{ "_class_wxColourData","_wxColourData",0},
{ "_class_wxPageSetupDialogData","_wxPageSetupDialogData",0},
@@ -4475,7 +4476,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxToolBarTool","_class_wxToolBarTool",0},
{ "_wxColourDialog","_class_wxColourDialog",0},
{ "_wxPrintData","_class_wxPrintData",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
@@ -4486,10 +4486,12 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxTextEntryDialog","_class_wxTextEntryDialog",0},
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
{ "_EBool","_signed_int",0},
@@ -4540,6 +4542,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
{ "_WXTYPE","_unsigned_short",0},
@@ -4581,7 +4584,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxToolBarTool","_wxToolBarTool",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
@@ -4656,6 +4658,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
{ "_class_wxControl","_wxControl",0},
@@ -4720,6 +4723,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxFileDataObject","_class_wxFileDataObject",0},
{ "_class_wxEraseEvent","_wxEraseEvent",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_class_wxFontDialog","_wxFontDialog",0},
{ "_wxWindow","_class_wxPreviewFrame",SwigwxPreviewFrameTowxWindow},
{ "_wxWindow","_wxPreviewFrame",SwigwxPreviewFrameTowxWindow},

128
utils/wxPython/src/msw/sizers.cpp
View File

@@ -104,17 +104,6 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
static char* wxStringErrorMsg = "string type is required for parameter";
class wxPyUserData : public wxObject {
public:
wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); }
~wxPyUserData() {
bool doSave = wxPyRestoreThread();
Py_DECREF(m_obj);
wxPySaveThread(doSave);
}
PyObject* m_obj;
};
class wxPySizer : public wxSizer {
DECLARE_DYNAMIC_CLASS(wxPySizer);
public:
@@ -464,6 +453,119 @@ static PyObject *_wrap_wxSizerItem_GetBorder(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxSizerItem_SetInitSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetInitSize(_swigarg0,_swigarg1))
static PyObject *_wrap_wxSizerItem_SetInitSize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSizerItem * _arg0;
int _arg1;
int _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","x","y", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxSizerItem_SetInitSize",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetInitSize. Expected _wxSizerItem_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxSizerItem_SetInitSize(_arg0,_arg1,_arg2);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxSizerItem_SetOption(_swigobj,_swigarg0) (_swigobj->SetOption(_swigarg0))
static PyObject *_wrap_wxSizerItem_SetOption(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSizerItem * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","option", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizerItem_SetOption",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetOption. Expected _wxSizerItem_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxSizerItem_SetOption(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxSizerItem_SetFlag(_swigobj,_swigarg0) (_swigobj->SetFlag(_swigarg0))
static PyObject *_wrap_wxSizerItem_SetFlag(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSizerItem * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","flag", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizerItem_SetFlag",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetFlag. Expected _wxSizerItem_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxSizerItem_SetFlag(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxSizerItem_SetBorder(_swigobj,_swigarg0) (_swigobj->SetBorder(_swigarg0))
static PyObject *_wrap_wxSizerItem_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSizerItem * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","border", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSizerItem_SetBorder",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxSizerItem_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSizerItem_SetBorder. Expected _wxSizerItem_p.");
return NULL;
}
}
{
wxPy_BEGIN_ALLOW_THREADS;
wxSizerItem_SetBorder(_arg0,_arg1);
wxPy_END_ALLOW_THREADS;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject * wxSizerItem_GetUserData(wxSizerItem *self) {
wxPyUserData* data = (wxPyUserData*)self->GetUserData();
if (data) {
@@ -1395,6 +1497,10 @@ static PyMethodDef sizerscMethods[] = {
{ "wxSizer_AddWindow", (PyCFunction) _wrap_wxSizer_AddWindow, METH_VARARGS | METH_KEYWORDS },
{ "wxSizer_Destroy", (PyCFunction) _wrap_wxSizer_Destroy, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_GetUserData", (PyCFunction) _wrap_wxSizerItem_GetUserData, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_SetBorder", (PyCFunction) _wrap_wxSizerItem_SetBorder, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_SetFlag", (PyCFunction) _wrap_wxSizerItem_SetFlag, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_SetOption", (PyCFunction) _wrap_wxSizerItem_SetOption, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_SetInitSize", (PyCFunction) _wrap_wxSizerItem_SetInitSize, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_GetBorder", (PyCFunction) _wrap_wxSizerItem_GetBorder, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_GetFlag", (PyCFunction) _wrap_wxSizerItem_GetFlag, METH_VARARGS | METH_KEYWORDS },
{ "wxSizerItem_GetOption", (PyCFunction) _wrap_wxSizerItem_GetOption, METH_VARARGS | METH_KEYWORDS },

12
utils/wxPython/src/msw/sizers.py
View File

@@ -55,6 +55,18 @@ class wxSizerItemPtr :
def GetBorder(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_GetBorder,(self,) + _args, _kwargs)
return val
def SetInitSize(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_SetInitSize,(self,) + _args, _kwargs)
return val
def SetOption(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_SetOption,(self,) + _args, _kwargs)
return val
def SetFlag(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_SetFlag,(self,) + _args, _kwargs)
return val
def SetBorder(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_SetBorder,(self,) + _args, _kwargs)
return val
def GetUserData(self, *_args, **_kwargs):
val = apply(sizersc.wxSizerItem_GetUserData,(self,) + _args, _kwargs)
return val

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

File diff suppressed because it is too large Load Diff

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

@@ -56,217 +56,251 @@ class wxStatusBar(wxStatusBarPtr):
class wxToolBarToolPtr :
class wxToolBarToolBasePtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self,stattoolc=stattoolc):
if self.thisown == 1 :
stattoolc.delete_wxToolBarTool(self)
def SetSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarTool_SetSize,(self,) + _args, _kwargs)
def Destroy(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_Destroy,(self,) + _args, _kwargs)
return val
def GetWidth(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarTool_GetWidth,(self,) + _args, _kwargs)
return val
def GetHeight(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarTool_GetHeight,(self,) + _args, _kwargs)
def GetId(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetId,(self,) + _args, _kwargs)
return val
def GetControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarTool_GetControl,(self,) + _args, _kwargs)
val = apply(stattoolc.wxToolBarToolBase_GetControl,(self,) + _args, _kwargs)
if val: val = wxControlPtr(val)
return val
def __setattr__(self,name,value):
if name == "m_toolStyle" :
stattoolc.wxToolBarTool_m_toolStyle_set(self,value)
return
if name == "m_clientData" :
stattoolc.wxToolBarTool_m_clientData_set(self,value)
return
if name == "m_index" :
stattoolc.wxToolBarTool_m_index_set(self,value)
return
if name == "m_x" :
stattoolc.wxToolBarTool_m_x_set(self,value)
return
if name == "m_y" :
stattoolc.wxToolBarTool_m_y_set(self,value)
return
if name == "m_width" :
stattoolc.wxToolBarTool_m_width_set(self,value)
return
if name == "m_height" :
stattoolc.wxToolBarTool_m_height_set(self,value)
return
if name == "m_toggleState" :
stattoolc.wxToolBarTool_m_toggleState_set(self,value)
return
if name == "m_isToggle" :
stattoolc.wxToolBarTool_m_isToggle_set(self,value)
return
if name == "m_deleteSecondBitmap" :
stattoolc.wxToolBarTool_m_deleteSecondBitmap_set(self,value)
return
if name == "m_enabled" :
stattoolc.wxToolBarTool_m_enabled_set(self,value)
return
if name == "m_bitmap1" :
stattoolc.wxToolBarTool_m_bitmap1_set(self,value.this)
return
if name == "m_bitmap2" :
stattoolc.wxToolBarTool_m_bitmap2_set(self,value.this)
return
if name == "m_isMenuCommand" :
stattoolc.wxToolBarTool_m_isMenuCommand_set(self,value)
return
if name == "m_shortHelpString" :
stattoolc.wxToolBarTool_m_shortHelpString_set(self,value)
return
if name == "m_longHelpString" :
stattoolc.wxToolBarTool_m_longHelpString_set(self,value)
return
self.__dict__[name] = value
def __getattr__(self,name):
if name == "m_toolStyle" :
return stattoolc.wxToolBarTool_m_toolStyle_get(self)
if name == "m_clientData" :
return stattoolc.wxToolBarTool_m_clientData_get(self)
if name == "m_index" :
return stattoolc.wxToolBarTool_m_index_get(self)
if name == "m_x" :
return stattoolc.wxToolBarTool_m_x_get(self)
if name == "m_y" :
return stattoolc.wxToolBarTool_m_y_get(self)
if name == "m_width" :
return stattoolc.wxToolBarTool_m_width_get(self)
if name == "m_height" :
return stattoolc.wxToolBarTool_m_height_get(self)
if name == "m_toggleState" :
return stattoolc.wxToolBarTool_m_toggleState_get(self)
if name == "m_isToggle" :
return stattoolc.wxToolBarTool_m_isToggle_get(self)
if name == "m_deleteSecondBitmap" :
return stattoolc.wxToolBarTool_m_deleteSecondBitmap_get(self)
if name == "m_enabled" :
return stattoolc.wxToolBarTool_m_enabled_get(self)
if name == "m_bitmap1" :
return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap1_get(self))
if name == "m_bitmap2" :
return wxBitmapPtr(stattoolc.wxToolBarTool_m_bitmap2_get(self))
if name == "m_isMenuCommand" :
return stattoolc.wxToolBarTool_m_isMenuCommand_get(self)
if name == "m_shortHelpString" :
return stattoolc.wxToolBarTool_m_shortHelpString_get(self)
if name == "m_longHelpString" :
return stattoolc.wxToolBarTool_m_longHelpString_get(self)
raise AttributeError,name
def GetToolBar(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetToolBar,(self,) + _args, _kwargs)
if val: val = wxToolBarBasePtr(val)
return val
def IsButton(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_IsButton,(self,) + _args, _kwargs)
return val
def IsControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_IsControl,(self,) + _args, _kwargs)
return val
def IsSeparator(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_IsSeparator,(self,) + _args, _kwargs)
return val
def GetStyle(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetStyle,(self,) + _args, _kwargs)
return val
def IsEnabled(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_IsEnabled,(self,) + _args, _kwargs)
return val
def IsToggled(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_IsToggled,(self,) + _args, _kwargs)
return val
def CanBeToggled(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_CanBeToggled,(self,) + _args, _kwargs)
return val
def GetBitmap1(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetBitmap1,(self,) + _args, _kwargs)
if val: val = wxBitmapPtr(val)
return val
def GetBitmap2(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetBitmap2,(self,) + _args, _kwargs)
if val: val = wxBitmapPtr(val)
return val
def GetBitmap(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetBitmap,(self,) + _args, _kwargs)
if val: val = wxBitmapPtr(val)
return val
def GetShortHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetShortHelp,(self,) + _args, _kwargs)
return val
def GetLongHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetLongHelp,(self,) + _args, _kwargs)
return val
def Enable(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_Enable,(self,) + _args, _kwargs)
return val
def Toggle(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_Toggle,(self,) + _args, _kwargs)
return val
def SetToggle(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_SetToggle,(self,) + _args, _kwargs)
return val
def SetShortHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_SetShortHelp,(self,) + _args, _kwargs)
return val
def SetLongHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_SetLongHelp,(self,) + _args, _kwargs)
return val
def SetBitmap1(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_SetBitmap1,(self,) + _args, _kwargs)
return val
def SetBitmap2(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_SetBitmap2,(self,) + _args, _kwargs)
return val
def Detach(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_Detach,(self,) + _args, _kwargs)
return val
def Attach(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_Attach,(self,) + _args, _kwargs)
return val
def GetClientData(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_GetClientData,(self,) + _args, _kwargs)
return val
def SetClientData(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarToolBase_SetClientData,(self,) + _args, _kwargs)
return val
def __repr__(self):
return "<C wxToolBarTool instance at %s>" % (self.this,)
class wxToolBarTool(wxToolBarToolPtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(stattoolc.new_wxToolBarTool,_args,_kwargs)
self.thisown = 1
return "<C wxToolBarToolBase instance at %s>" % (self.this,)
class wxToolBarToolBase(wxToolBarToolBasePtr):
def __init__(self,this):
self.this = this
class wxToolBarPtr(wxControlPtr):
class wxToolBarBasePtr(wxControlPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def AddControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_AddControl,(self,) + _args, _kwargs)
return val
def AddSeparator(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_AddSeparator,(self,) + _args, _kwargs)
return val
def ClearTools(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_ClearTools,(self,) + _args, _kwargs)
return val
def AddTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_AddTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolPtr(val)
val = apply(stattoolc.wxToolBarBase_AddTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def AddSimpleTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_AddSimpleTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolPtr(val)
val = apply(stattoolc.wxToolBarBase_AddSimpleTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def EnableTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_EnableTool,(self,) + _args, _kwargs)
def InsertTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def FindToolForPosition(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs)
if val: val = wxToolBarToolPtr(val)
def InsertSimpleTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertSimpleTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def GetToolSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolSize,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
def AddControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_AddControl,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def GetToolBitmapSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolBitmapSize,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
def InsertControl(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertControl,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def SetToolBitmapSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetToolBitmapSize,(self,) + _args, _kwargs)
def AddSeparator(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_AddSeparator,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def GetToolMargins(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolMargins,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
def InsertSeparator(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_InsertSeparator,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def GetMaxSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetMaxSize,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
def RemoveTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_RemoveTool,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def GetToolEnabled(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolEnabled,(self,) + _args, _kwargs)
def DeleteToolByPos(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_DeleteToolByPos,(self,) + _args, _kwargs)
return val
def GetToolLongHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolLongHelp,(self,) + _args, _kwargs)
def DeleteTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_DeleteTool,(self,) + _args, _kwargs)
return val
def GetToolPacking(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolPacking,(self,) + _args, _kwargs)
return val
def GetToolSeparation(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolSeparation,(self,) + _args, _kwargs)
return val
def GetToolShortHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolShortHelp,(self,) + _args, _kwargs)
return val
def GetToolState(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetToolState,(self,) + _args, _kwargs)
def ClearTools(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_ClearTools,(self,) + _args, _kwargs)
return val
def Realize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_Realize,(self,) + _args, _kwargs)
val = apply(stattoolc.wxToolBarBase_Realize,(self,) + _args, _kwargs)
return val
def SetToolLongHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetToolLongHelp,(self,) + _args, _kwargs)
return val
def SetToolShortHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetToolShortHelp,(self,) + _args, _kwargs)
return val
def SetMargins(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetMargins,(self,) + _args, _kwargs)
return val
def SetToolPacking(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetToolPacking,(self,) + _args, _kwargs)
return val
def SetToolSeparation(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetToolSeparation,(self,) + _args, _kwargs)
def EnableTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_EnableTool,(self,) + _args, _kwargs)
return val
def ToggleTool(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_ToggleTool,(self,) + _args, _kwargs)
val = apply(stattoolc.wxToolBarBase_ToggleTool,(self,) + _args, _kwargs)
return val
def SetToggle(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetToggle,(self,) + _args, _kwargs)
val = apply(stattoolc.wxToolBarBase_SetToggle,(self,) + _args, _kwargs)
return val
def GetToolClientData(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolClientData,(self,) + _args, _kwargs)
return val
def SetToolClientData(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetToolClientData,(self,) + _args, _kwargs)
return val
def GetToolState(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolState,(self,) + _args, _kwargs)
return val
def GetToolEnabled(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolEnabled,(self,) + _args, _kwargs)
return val
def SetToolShortHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetToolShortHelp,(self,) + _args, _kwargs)
return val
def GetToolShortHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolShortHelp,(self,) + _args, _kwargs)
return val
def SetToolLongHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetToolLongHelp,(self,) + _args, _kwargs)
return val
def GetToolLongHelp(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolLongHelp,(self,) + _args, _kwargs)
return val
def SetMarginsXY(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetMarginsXY,(self,) + _args, _kwargs)
return val
def SetMargins(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetMargins,(self,) + _args, _kwargs)
return val
def SetToolPacking(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetToolPacking,(self,) + _args, _kwargs)
return val
def SetToolSeparation(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetToolSeparation,(self,) + _args, _kwargs)
return val
def GetToolMargins(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolMargins,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def GetToolPacking(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolPacking,(self,) + _args, _kwargs)
return val
def GetToolSeparation(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolSeparation,(self,) + _args, _kwargs)
return val
def SetRows(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetRows,(self,) + _args, _kwargs)
return val
def SetMaxRowsCols(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_SetMaxRowsCols,(self,) + _args, _kwargs)
val = apply(stattoolc.wxToolBarBase_SetMaxRowsCols,(self,) + _args, _kwargs)
return val
def GetMaxRows(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetMaxRows,(self,) + _args, _kwargs)
val = apply(stattoolc.wxToolBarBase_GetMaxRows,(self,) + _args, _kwargs)
return val
def GetMaxCols(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_GetMaxCols,(self,) + _args, _kwargs)
val = apply(stattoolc.wxToolBarBase_GetMaxCols,(self,) + _args, _kwargs)
return val
def SetToolBitmapSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_SetToolBitmapSize,(self,) + _args, _kwargs)
return val
def GetToolBitmapSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolBitmapSize,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def GetToolSize(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarBase_GetToolSize,(self,) + _args, _kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def __repr__(self):
return "<C wxToolBarBase instance at %s>" % (self.this,)
class wxToolBarBase(wxToolBarBasePtr):
def __init__(self,this):
self.this = this
class wxToolBarPtr(wxToolBarBasePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def FindToolForPosition(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBar_FindToolForPosition,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def __repr__(self):
return "<C wxToolBar instance at %s>" % (self.this,)
@@ -279,6 +313,25 @@ class wxToolBar(wxToolBarPtr):
class wxToolBarSimplePtr(wxToolBarBasePtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def FindToolForPosition(self, *_args, **_kwargs):
val = apply(stattoolc.wxToolBarSimple_FindToolForPosition,(self,) + _args, _kwargs)
if val: val = wxToolBarToolBasePtr(val)
return val
def __repr__(self):
return "<C wxToolBarSimple instance at %s>" % (self.this,)
class wxToolBarSimple(wxToolBarSimplePtr):
def __init__(self,*_args,**_kwargs):
self.this = apply(stattoolc.new_wxToolBarSimple,_args,_kwargs)
self.thisown = 1
wx._StdWindowCallbacks(self)
#-------------- FUNCTION WRAPPERS ------------------
@@ -287,3 +340,6 @@ class wxToolBar(wxToolBarPtr):
#-------------- VARIABLE WRAPPERS ------------------
wxTOOL_STYLE_BUTTON = stattoolc.wxTOOL_STYLE_BUTTON
wxTOOL_STYLE_SEPARATOR = stattoolc.wxTOOL_STYLE_SEPARATOR
wxTOOL_STYLE_CONTROL = stattoolc.wxTOOL_STYLE_CONTROL

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

@@ -8804,7 +8804,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_EBool","_wxWindowID",0},
{ "_class_wxRegion","_wxRegion",0},
{ "_class_wxDataFormat","_wxDataFormat",0},
{ "_wxGDIImage","_class_wxGDIImage",0},
{ "_wxFont","_class_wxFont",0},
{ "_class_wxPyDropTarget","_wxPyDropTarget",0},
{ "_unsigned_long","_wxDash",0},
@@ -8880,7 +8879,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxPyDataObjectSimple","_wxPyDataObjectSimple",0},
{ "_class_wxPyDropSource","_wxPyDropSource",0},
{ "_class_wxImageList","_wxImageList",0},
{ "_class_wxGDIImage","_wxGDIImage",0},
{ "_wxWindowID","_wxCoord",0},
{ "_wxWindowID","_wxPrintQuality",0},
{ "_wxWindowID","_size_t",0},

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

@@ -1769,6 +1769,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0},
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_wxMask","_class_wxMask",0},
{ "_wxGrid","_class_wxGrid",0},
{ "_wxPen","_class_wxPen",0},
@@ -1872,18 +1873,19 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxToolBarTool","_class_wxToolBarTool",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
{ "_class_wxNotifyEvent","_wxNotifyEvent",0},
{ "_class_wxValidator","_wxValidator",0},
{ "_class_wxPyEvent","_wxPyEvent",0},
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
@@ -1930,6 +1932,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
@@ -1971,7 +1974,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxToolBarTool","_wxToolBarTool",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
@@ -2043,6 +2045,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
{ "_wxIconizeEvent","_class_wxIconizeEvent",0},
{ "_class_wxControl","_wxControl",0},
@@ -2103,6 +2106,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxEraseEvent","_wxEraseEvent",0},
{ "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_wxWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow},
{ "_wxWindow","_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxWindow},
{ "_wxWindow","_class_wxSashWindow",SwigwxSashWindowTowxWindow},

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

@@ -1668,6 +1668,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxCursor","_class_wxCursor",0},
{ "_wxNotifyEvent","_class_wxNotifyEvent",0},
{ "_wxImageHandler","_class_wxImageHandler",0},
{ "_class_wxToolBarBase","_wxToolBarBase",0},
{ "_class_wxTreeCtrl","_wxTreeCtrl",0},
{ "_wxMask","_class_wxMask",0},
{ "_wxToolTip","_class_wxToolTip",0},
@@ -1697,6 +1698,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxBitmapButton","_class_wxBitmapButton",0},
{ "_wxSashWindow","_class_wxSashWindow",0},
{ "_class_wxSizer","_wxSizer",0},
{ "_class_wxTIFFHandler","_wxTIFFHandler",0},
{ "_class_wxPrintDialogData","_wxPrintDialogData",0},
{ "_class_wxAcceleratorTable","_wxAcceleratorTable",0},
{ "_class_wxClipboard","_wxClipboard",0},
@@ -1790,7 +1792,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxWindowDC","_class_wxWindowDC",0},
{ "_wxScrollBar","_class_wxScrollBar",0},
{ "_wxSpinButton","_class_wxSpinButton",0},
{ "_wxToolBarTool","_class_wxToolBarTool",0},
{ "_wxColourDialog","_class_wxColourDialog",0},
{ "_wxPrintData","_class_wxPrintData",0},
{ "_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0},
@@ -1802,12 +1803,14 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxIconizeEvent","_wxIconizeEvent",0},
{ "_class_wxStaticBitmap","_wxStaticBitmap",0},
{ "_class_wxBusyCursor","_wxBusyCursor",0},
{ "_wxToolBarSimple","_class_wxToolBarSimple",0},
{ "_wxMDIChildFrame","_class_wxMDIChildFrame",0},
{ "_wxListItem","_class_wxListItem",0},
{ "_class_wxToolBar","_wxToolBar",0},
{ "_wxDropTarget","_class_wxDropTarget",0},
{ "_class_wxStaticLine","_wxStaticLine",0},
{ "_wxScrollEvent","_class_wxScrollEvent",0},
{ "_wxToolBarToolBase","_class_wxToolBarToolBase",0},
{ "_wxCalculateLayoutEvent","_class_wxCalculateLayoutEvent",0},
{ "_EBool","_wxCoord",0},
{ "_EBool","_wxPrintQuality",0},
@@ -1860,6 +1863,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxMoveEvent","_wxMoveEvent",0},
{ "_wxListBox","_class_wxListBox",0},
{ "_wxScreenDC","_class_wxScreenDC",0},
{ "_class_wxToolBarSimple","_wxToolBarSimple",0},
{ "_class_wxMDIChildFrame","_wxMDIChildFrame",0},
{ "_WXTYPE","_short",0},
{ "_WXTYPE","_signed_short",0},
@@ -1904,7 +1908,6 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxFocusEvent","_wxFocusEvent",0},
{ "_class_wxMaximizeEvent","_wxMaximizeEvent",0},
{ "_wxStatusBar","_class_wxStatusBar",0},
{ "_class_wxToolBarTool","_wxToolBarTool",0},
{ "_class_wxAcceleratorEntry","_wxAcceleratorEntry",0},
{ "_class_wxCursor","_wxCursor",0},
{ "_wxPyFileDropTarget","_class_wxPyFileDropTarget",0},
@@ -1988,6 +1991,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_class_wxComboBox","_wxComboBox",0},
{ "_class_wxRadioButton","_wxRadioButton",0},
{ "_wxValidator","_class_wxValidator",0},
{ "_wxToolBarBase","_class_wxToolBarBase",0},
{ "_class_wxTreeItemId","_wxTreeItemId",0},
{ "_wxTreeCtrl","_class_wxTreeCtrl",0},
{ "_class_wxLayoutConstraints","_wxLayoutConstraints",0},
@@ -2019,6 +2023,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxSizer","_class_wxSizer",0},
{ "_class_wxShowEvent","_wxShowEvent",0},
{ "_class_wxPCXHandler","_wxPCXHandler",0},
{ "_wxTIFFHandler","_class_wxTIFFHandler",0},
{ "_wxPyDropTarget","_class_wxPyDropTarget",0},
{ "_wxActivateEvent","_class_wxActivateEvent",0},
{ "_wxGauge","_class_wxGauge",0},
@@ -2060,6 +2065,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxPyFontEnumerator","_class_wxPyFontEnumerator",0},
{ "_wxMDIClientWindow","_class_wxMDIClientWindow",0},
{ "_class_wxDataObjectComposite","_wxDataObjectComposite",0},
{ "_class_wxToolBarToolBase","_wxToolBarToolBase",0},
{ "_class_wxFontDialog","_wxFontDialog",0},
{ "_wxWindow","_class_wxWindow",0},
{ "_class_wxWindowDestroyEvent","_wxWindowDestroyEvent",0},
@@ -2322,6 +2328,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxBITMAP_TYPE_ANY", PyInt_FromLong((long) wxBITMAP_TYPE_ANY));
PyDict_SetItemString(d,"wxBITMAP_TYPE_RESOURCE", PyInt_FromLong((long) wxBITMAP_TYPE_RESOURCE));
PyDict_SetItemString(d,"wxBITMAP_TYPE_JPEG", PyInt_FromLong((long) wxBITMAP_TYPE_JPEG));
PyDict_SetItemString(d,"wxBITMAP_TYPE_PCX", PyInt_FromLong((long) wxBITMAP_TYPE_PCX));
PyDict_SetItemString(d,"wxOPEN", PyInt_FromLong((long) wxOPEN));
PyDict_SetItemString(d,"wxSAVE", PyInt_FromLong((long) wxSAVE));
PyDict_SetItemString(d,"wxHIDE_READONLY", PyInt_FromLong((long) wxHIDE_READONLY));

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

@@ -391,6 +391,7 @@ wxBITMAP_TYPE_PNG_RESOURCE = wxc.wxBITMAP_TYPE_PNG_RESOURCE
wxBITMAP_TYPE_ANY = wxc.wxBITMAP_TYPE_ANY
wxBITMAP_TYPE_RESOURCE = wxc.wxBITMAP_TYPE_RESOURCE
wxBITMAP_TYPE_JPEG = wxc.wxBITMAP_TYPE_JPEG
wxBITMAP_TYPE_PCX = wxc.wxBITMAP_TYPE_PCX
wxOPEN = wxc.wxOPEN
wxSAVE = wxc.wxSAVE
wxHIDE_READONLY = wxc.wxHIDE_READONLY
@@ -1486,6 +1487,8 @@ wxPyDefaultSize.Set(-1,-1)
wxDefaultPosition = wxPyDefaultPosition
wxDefaultSize = wxPyDefaultSize
# backwards compatibility
wxNoRefBitmap = wxBitmap
#----------------------------------------------------------------------
# This helper function will take a wxPython object and convert it to
@@ -1515,7 +1518,8 @@ def wxPyTypeCast(obj, typeStr):
newPtr = ptrcast(obj, typeStr+"_p")
theClass = globals()[typeStr+"Ptr"]
theObj = theClass(newPtr)
theObj.thisown = obj.thisown
if hasattr(obj, "this"):
theObj.thisown = obj.thisown
return theObj
@@ -1600,6 +1604,13 @@ class wxApp(wxPyApp):
if self.stdioWin != None:
self.stdioWin.close()
#----------------------------------------------------------------------------
class wxPySimpleApp(wxApp):
def __init__(self):
wxApp.__init__(self, 0)
def OnInit(self):
return true
#----------------------------------------------------------------------------

19
utils/wxPython/src/sizers.i
View File

@@ -32,20 +32,6 @@
//---------------------------------------------------------------------------
%{
class wxPyUserData : public wxObject {
public:
wxPyUserData(PyObject* obj) { m_obj = obj; Py_INCREF(m_obj); }
~wxPyUserData() {
bool doSave = wxPyRestoreThread();
Py_DECREF(m_obj);
wxPySaveThread(doSave);
}
PyObject* m_obj;
};
%}
//---------------------------------------------------------------------------
class wxSizerItem {
public:
@@ -69,6 +55,11 @@ public:
int GetFlag();
int GetBorder();
void SetInitSize( int x, int y );
void SetOption( int option );
void SetFlag( int flag );
void SetBorder( int border );
// wxObject* GetUserData();
%addmethods {
// Assume that the user data is a wxPyUserData object and return the contents

248
utils/wxPython/src/stattool.i
View File

@@ -65,13 +65,250 @@ public:
//---------------------------------------------------------------------------
class wxToolBarBase;
enum wxToolBarToolStyle
{
wxTOOL_STYLE_BUTTON = 1,
wxTOOL_STYLE_SEPARATOR = 2,
wxTOOL_STYLE_CONTROL
};
class wxToolBarToolBase {
public:
// wxToolBarToolBase(wxToolBarBase *tbar = (wxToolBarBase *)NULL,
// int id = wxID_SEPARATOR,
// const wxBitmap& bitmap1 = wxNullBitmap,
// const wxBitmap& bitmap2 = wxNullBitmap,
// bool toggle = FALSE,
// wxObject *clientData = (wxObject *) NULL,
// const wxString& shortHelpString = wxEmptyString,
// const wxString& longHelpString = wxEmptyString);
// wxToolBarToolBase(wxToolBarBase *tbar, wxControl *control);
// ~wxToolBarToolBase();
%addmethods { void Destroy() { delete self; } }
int GetId();
wxControl *GetControl();
wxToolBarBase *GetToolBar();
int IsButton();
int IsControl();
int IsSeparator();
int GetStyle();
bool IsEnabled();
bool IsToggled();
bool CanBeToggled();
const wxBitmap& GetBitmap1();
const wxBitmap& GetBitmap2();
const wxBitmap& GetBitmap();
wxString GetShortHelp();
wxString GetLongHelp();
bool Enable(bool enable);
bool Toggle(bool toggle);
bool SetToggle(bool toggle);
bool SetShortHelp(const wxString& help);
bool SetLongHelp(const wxString& help);
void SetBitmap1(const wxBitmap& bmp);
void SetBitmap2(const wxBitmap& bmp);
void Detach();
void Attach(wxToolBarBase *tbar);
//wxObject *GetClientData();
%addmethods {
// convert the ClientData back to a PyObject
PyObject* GetClientData() {
wxPyUserData* udata = (wxPyUserData*)self->GetClientData();
if (udata) {
Py_INCREF(udata->m_obj);
return udata->m_obj;
} else {
Py_INCREF(Py_None);
return Py_None;
}
}
void SetClientData(PyObject* clientData) {
self->SetClientData(new wxPyUserData(clientData));
}
}
};
class wxToolBarBase : public wxControl {
public:
// This is an Abstract Base Class
%addmethods {
// wrap ClientData in a class that knows about PyObjects
wxToolBarToolBase *AddTool(int id,
const wxBitmap& bitmap,
const wxBitmap& pushedBitmap = wxNullBitmap,
int toggle = FALSE,
PyObject *clientData = NULL,
const wxString& shortHelpString = wxPyEmptyStr,
const wxString& longHelpString = wxPyEmptyStr) {
wxPyUserData* udata = NULL;
if (clientData)
udata = new wxPyUserData(clientData);
return self->AddTool(id, bitmap, pushedBitmap, (bool)toggle,
udata, shortHelpString, longHelpString);
}
// This one is easier to use...
wxToolBarToolBase *AddSimpleTool(int id,
const wxBitmap& bitmap,
const wxString& shortHelpString = wxPyEmptyStr,
const wxString& longHelpString = wxPyEmptyStr,
int toggle = FALSE) {
return self->AddTool(id, bitmap, wxNullBitmap, toggle, NULL,
shortHelpString, longHelpString);
}
// wrap ClientData in a class that knows about PyObjects
wxToolBarToolBase *InsertTool(size_t pos,
int id,
const wxBitmap& bitmap,
const wxBitmap& pushedBitmap = wxNullBitmap,
int toggle = FALSE,
PyObject *clientData = NULL,
const wxString& shortHelpString = wxPyEmptyStr,
const wxString& longHelpString = wxPyEmptyStr) {
wxPyUserData* udata = NULL;
if (clientData)
udata = new wxPyUserData(clientData);
return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)toggle,
udata, shortHelpString, longHelpString);
}
// This one is easier to use...
wxToolBarToolBase *InsertSimpleTool(size_t pos,
int id,
const wxBitmap& bitmap,
const wxString& shortHelpString = wxPyEmptyStr,
const wxString& longHelpString = wxPyEmptyStr,
int toggle = FALSE) {
return self->InsertTool(pos, id, bitmap, wxNullBitmap, toggle, NULL,
shortHelpString, longHelpString);
}
}
wxToolBarToolBase *AddControl(wxControl *control);
wxToolBarToolBase *InsertControl(size_t pos, wxControl *control);
wxToolBarToolBase *AddSeparator();
wxToolBarToolBase *InsertSeparator(size_t pos);
wxToolBarToolBase *RemoveTool(int id);
bool DeleteToolByPos(size_t pos);
bool DeleteTool(int id);
void ClearTools();
bool Realize();
void EnableTool(int id, bool enable);
void ToggleTool(int id, bool toggle);
void SetToggle(int id, bool toggle);
%addmethods {
// convert the ClientData back to a PyObject
PyObject* GetToolClientData(int index) {
wxPyUserData* udata = (wxPyUserData*)self->GetToolClientData(index);
if (udata) {
Py_INCREF(udata->m_obj);
return udata->m_obj;
} else {
Py_INCREF(Py_None);
return Py_None;
}
}
void SetToolClientData(int index, PyObject* clientData) {
self->SetToolClientData(index, new wxPyUserData(clientData));
}
}
bool GetToolState(int id);
bool GetToolEnabled(int id);
void SetToolShortHelp(int id, const wxString& helpString);
wxString GetToolShortHelp(int id);
void SetToolLongHelp(int id, const wxString& helpString);
wxString GetToolLongHelp(int id);
%name(SetMarginsXY) void SetMargins(int x, int y);
void SetMargins(const wxSize& size);
void SetToolPacking(int packing);
void SetToolSeparation(int separation);
wxSize GetToolMargins();
int GetToolPacking();
int GetToolSeparation();
void SetRows(int nRows);
void SetMaxRowsCols(int rows, int cols);
int GetMaxRows();
int GetMaxCols();
void SetToolBitmapSize(const wxSize& size);
wxSize GetToolBitmapSize();
wxSize GetToolSize();
};
class wxToolBar : public wxToolBarBase {
public:
wxToolBar(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxPyDefaultPosition,
const wxSize& size = wxPyDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr);
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
};
class wxToolBarSimple : public wxToolBarBase {
public:
wxToolBarSimple(wxWindow *parent,
wxWindowID id,
const wxPoint& pos = wxPyDefaultPosition,
const wxSize& size = wxPyDefaultSize,
long style = wxNO_BORDER | wxTB_HORIZONTAL,
const wxString& name = wxToolBarNameStr);
%pragma(python) addtomethod = "__init__:wx._StdWindowCallbacks(self)"
wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y);
};
//---------------------------------------------------------------------------
#ifdef THE_OLD_ONE
class wxToolBarTool {
public:
wxToolBarTool();
~wxToolBarTool();
void SetSize( long w, long h ) { m_width = w; m_height = h; }
long GetWidth () const { return m_width; }
long GetHeight () const { return m_height; }
void SetSize( long w, long h )
long GetWidth ();
long GetHeight ();
wxControl *GetControl();
public:
@@ -166,13 +403,14 @@ public:
void SetToolPacking(int packing);
void SetToolSeparation(int separation);
void ToggleTool(int toolIndex, const bool toggle);
#ifdef __WXMSW__
void SetToggle(int toolIndex, bool toggle);
void SetMaxRowsCols(int rows, int cols);
int GetMaxRows();
int GetMaxCols();
#endif
};
#endif
//---------------------------------------------------------------------------

4
utils/wxPython/src/windows.i
View File

@@ -142,9 +142,7 @@ public:
wxPyValidator();
// ~wxPyValidator();
%addmethods {
void Destroy() { delete self; }
}
%addmethods { void Destroy() { delete self; } }
void _setSelf(PyObject* self, int incref=TRUE);
%pragma(python) addtomethod = "__init__:self._setSelf(self, 0)"