Mirrors_UI_SDK/wxWidgets
1
0
Fork 0
mirror of https://github.com/wxWidgets/wxWidgets.git synced 2026-09-21 21:47:55 +08:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Lots of changes for wxPython to start using many of the new featues in

Browse Source 
wxWindows 2.5


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22265 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-07-24 00:28:34 +00:00
parent e4a7bbfc1e
commit 3ef86e32dd
61 changed files with 5696 additions and 1666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wxPython/CHANGES.txt
+34
View File
@@ -2,6 +2,40 @@ CHANGES.txt for wxPython
----------------------------------------------------------------------
2.5.0.x
-------
Many, many little fixes, changes and additions done as part of the move
to wxWindows 2.5 that I have forgotten about.
Changed the import-startup-bootstrap process employed by wxPython such
that wxWindows and the underlying gui toolkit are not initialized
until the wxApp object is created (but before wxApp.OnInit is called.)
This was required because of changes made to the C++ wxApp class.
There are both benefits and potential problems with this change. The
benefits are that you can import wxPython without requiring access to
a GUI (for checking version numbers, etc.) and that in a
multi-threaded environment the thread that creates the app object will
now be the GUI thread instead of the one that imports wxPython. Some
potential problems are that the C++ side of the "stock-objects"
(wxBLUE_PEN, wxTheColourDatabase, etc.) are not initialized until the
wxApp object is created, so you should not use them until then. Also,
you will probably not be able to do any kind of GUI operation unless
you have an app object first, (even on Windows where most anything was
possible beofre.)
Added wxMirrorDC.
Added wxIconLocation
wxPython's setup.py script now expects to use existing libraries for
the contribs (gizmos, stc, xrc, etc.) rather than building local
copies of them.
2.4.1.x
-------
wxPython/contrib/stc/gtk/stc_.cpp
+187
View File
@@ -7933,6 +7933,34 @@ static PyObject *_wrap_wxStyledTextCtrl_LineEndDisplayExtend(PyObject *self, PyO
return _resultobj;
}
#define wxStyledTextCtrl_LineCopy(_swigobj) (_swigobj->LineCopy())
static PyObject *_wrap_wxStyledTextCtrl_LineCopy(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxStyledTextCtrl * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxStyledTextCtrl_LineCopy",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_LineCopy. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxStyledTextCtrl_LineCopy(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxStyledTextCtrl_MoveCaretInsideView(_swigobj) (_swigobj->MoveCaretInsideView())
static PyObject *_wrap_wxStyledTextCtrl_MoveCaretInsideView(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -9605,6 +9633,134 @@ static PyObject *_wrap_wxStyledTextCtrl_SetHotspotActiveUnderline(PyObject *self
return _resultobj;
}
#define wxStyledTextCtrl_PositionBefore(_swigobj,_swigarg0) (_swigobj->PositionBefore(_swigarg0))
static PyObject *_wrap_wxStyledTextCtrl_PositionBefore(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxStyledTextCtrl * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","pos", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionBefore",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_PositionBefore. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxStyledTextCtrl_PositionBefore(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxStyledTextCtrl_PositionAfter(_swigobj,_swigarg0) (_swigobj->PositionAfter(_swigarg0))
static PyObject *_wrap_wxStyledTextCtrl_PositionAfter(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxStyledTextCtrl * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","pos", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxStyledTextCtrl_PositionAfter",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_PositionAfter. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxStyledTextCtrl_PositionAfter(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxStyledTextCtrl_CopyRange(_swigobj,_swigarg0,_swigarg1) (_swigobj->CopyRange(_swigarg0,_swigarg1))
static PyObject *_wrap_wxStyledTextCtrl_CopyRange(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxStyledTextCtrl * _arg0;
int _arg1;
int _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","start","end", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxStyledTextCtrl_CopyRange",_kwnames,&_argo0,&_arg1,&_arg2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_CopyRange. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxStyledTextCtrl_CopyRange(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxStyledTextCtrl_CopyText(_swigobj,_swigarg0,_swigarg1) (_swigobj->CopyText(_swigarg0,_swigarg1))
static PyObject *_wrap_wxStyledTextCtrl_CopyText(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxStyledTextCtrl * _arg0;
int _arg1;
wxString * _arg2;
PyObject * _argo0 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","length","text", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO:wxStyledTextCtrl_CopyText",_kwnames,&_argo0,&_arg1,&_obj2))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxStyledTextCtrl_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxStyledTextCtrl_CopyText. Expected _wxStyledTextCtrl_p.");
return NULL;
}
}
{
_arg2 = wxString_in_helper(_obj2);
if (_arg2 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxStyledTextCtrl_CopyText(_arg0,_arg1,*_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj2)
delete _arg2;
}
return _resultobj;
}
#define wxStyledTextCtrl_StartRecord(_swigobj) (_swigobj->StartRecord())
static PyObject *_wrap_wxStyledTextCtrl_StartRecord(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -11921,6 +12077,10 @@ static PyMethodDef stc_cMethods[] = {
{ "wxStyledTextCtrl_SetLexer", (PyCFunction) _wrap_wxStyledTextCtrl_SetLexer, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_StopRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StopRecord, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_StartRecord", (PyCFunction) _wrap_wxStyledTextCtrl_StartRecord, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_CopyText", (PyCFunction) _wrap_wxStyledTextCtrl_CopyText, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_CopyRange", (PyCFunction) _wrap_wxStyledTextCtrl_CopyRange, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_PositionAfter", (PyCFunction) _wrap_wxStyledTextCtrl_PositionAfter, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_PositionBefore", (PyCFunction) _wrap_wxStyledTextCtrl_PositionBefore, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_SetHotspotActiveUnderline", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveUnderline, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_SetHotspotActiveBackground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveBackground, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_SetHotspotActiveForeground", (PyCFunction) _wrap_wxStyledTextCtrl_SetHotspotActiveForeground, METH_VARARGS | METH_KEYWORDS },
@@ -11976,6 +12136,7 @@ static PyMethodDef stc_cMethods[] = {
{ "wxStyledTextCtrl_BraceHighlight", (PyCFunction) _wrap_wxStyledTextCtrl_BraceHighlight, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_LineLength", (PyCFunction) _wrap_wxStyledTextCtrl_LineLength, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_MoveCaretInsideView", (PyCFunction) _wrap_wxStyledTextCtrl_MoveCaretInsideView, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_LineCopy", (PyCFunction) _wrap_wxStyledTextCtrl_LineCopy, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_LineEndDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplayExtend, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_LineEndDisplay", (PyCFunction) _wrap_wxStyledTextCtrl_LineEndDisplay, METH_VARARGS | METH_KEYWORDS },
{ "wxStyledTextCtrl_HomeDisplayExtend", (PyCFunction) _wrap_wxStyledTextCtrl_HomeDisplayExtend, METH_VARARGS | METH_KEYWORDS },
@@ -12559,6 +12720,8 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_LEX_F77", PyInt_FromLong((long) 37));
PyDict_SetItemString(d,"wxSTC_LEX_CSS", PyInt_FromLong((long) 38));
PyDict_SetItemString(d,"wxSTC_LEX_POV", PyInt_FromLong((long) 39));
PyDict_SetItemString(d,"wxSTC_LEX_LOUT", PyInt_FromLong((long) 40));
PyDict_SetItemString(d,"wxSTC_LEX_ESCRIPT", PyInt_FromLong((long) 41));
PyDict_SetItemString(d,"wxSTC_LEX_AUTOMATIC", PyInt_FromLong((long) 1000));
PyDict_SetItemString(d,"wxSTC_P_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_P_COMMENTLINE", PyInt_FromLong((long) 1));
@@ -12593,6 +12756,7 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_C_WORD2", PyInt_FromLong((long) 16));
PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORD", PyInt_FromLong((long) 17));
PyDict_SetItemString(d,"wxSTC_C_COMMENTDOCKEYWORDERROR", PyInt_FromLong((long) 18));
PyDict_SetItemString(d,"wxSTC_C_GLOBALCLASS", PyInt_FromLong((long) 19));
PyDict_SetItemString(d,"wxSTC_H_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_H_TAG", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_H_TAGUNKNOWN", PyInt_FromLong((long) 2));
@@ -12965,6 +13129,29 @@ SWIGEXPORT(void) initstc_c() {
PyDict_SetItemString(d,"wxSTC_POV_IDENTIFIER", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_POV_BRACE", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_POV_WORD2", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_LOUT_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_LOUT_COMMENT", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_LOUT_NUMBER", PyInt_FromLong((long) 2));
PyDict_SetItemString(d,"wxSTC_LOUT_WORD", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_LOUT_WORD2", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_LOUT_WORD3", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_LOUT_WORD4", PyInt_FromLong((long) 6));
PyDict_SetItemString(d,"wxSTC_LOUT_STRING", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTC_LOUT_OPERATOR", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_LOUT_IDENTIFIER", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_LOUT_STRINGEOL", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_DEFAULT", PyInt_FromLong((long) 0));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENT", PyInt_FromLong((long) 1));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTLINE", PyInt_FromLong((long) 2));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_COMMENTDOC", PyInt_FromLong((long) 3));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_NUMBER", PyInt_FromLong((long) 4));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD", PyInt_FromLong((long) 5));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_STRING", PyInt_FromLong((long) 6));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_OPERATOR", PyInt_FromLong((long) 7));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_IDENTIFIER", PyInt_FromLong((long) 8));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_BRACE", PyInt_FromLong((long) 9));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD2", PyInt_FromLong((long) 10));
PyDict_SetItemString(d,"wxSTC_ESCRIPT_WORD3", PyInt_FromLong((long) 11));
PyDict_SetItemString(d,"wxSTC_CMD_REDO", PyInt_FromLong((long) 2011));
PyDict_SetItemString(d,"wxSTC_CMD_SELECTALL", PyInt_FromLong((long) 2013));
PyDict_SetItemString(d,"wxSTC_CMD_UNDO", PyInt_FromLong((long) 2176));
wxPython/contrib/stc/gtk/stc_.py
+41
View File
@@ -878,6 +878,9 @@ class wxStyledTextCtrlPtr(wxControlPtr):
def LineEndDisplayExtend(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_LineEndDisplayExtend(self, *_args, **_kwargs)
return val
def LineCopy(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_LineCopy(self, *_args, **_kwargs)
return val
def MoveCaretInsideView(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_MoveCaretInsideView(self, *_args, **_kwargs)
return val
@@ -1044,6 +1047,18 @@ class wxStyledTextCtrlPtr(wxControlPtr):
def SetHotspotActiveUnderline(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_SetHotspotActiveUnderline(self, *_args, **_kwargs)
return val
def PositionBefore(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_PositionBefore(self, *_args, **_kwargs)
return val
def PositionAfter(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_PositionAfter(self, *_args, **_kwargs)
return val
def CopyRange(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_CopyRange(self, *_args, **_kwargs)
return val
def CopyText(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_CopyText(self, *_args, **_kwargs)
return val
def StartRecord(self, *_args, **_kwargs):
val = stc_c.wxStyledTextCtrl_StartRecord(self, *_args, **_kwargs)
return val
@@ -1497,6 +1512,8 @@ wxSTC_LEX_FORTRAN = stc_c.wxSTC_LEX_FORTRAN
wxSTC_LEX_F77 = stc_c.wxSTC_LEX_F77
wxSTC_LEX_CSS = stc_c.wxSTC_LEX_CSS
wxSTC_LEX_POV = stc_c.wxSTC_LEX_POV
wxSTC_LEX_LOUT = stc_c.wxSTC_LEX_LOUT
wxSTC_LEX_ESCRIPT = stc_c.wxSTC_LEX_ESCRIPT
wxSTC_LEX_AUTOMATIC = stc_c.wxSTC_LEX_AUTOMATIC
wxSTC_P_DEFAULT = stc_c.wxSTC_P_DEFAULT
wxSTC_P_COMMENTLINE = stc_c.wxSTC_P_COMMENTLINE
@@ -1531,6 +1548,7 @@ wxSTC_C_COMMENTLINEDOC = stc_c.wxSTC_C_COMMENTLINEDOC
wxSTC_C_WORD2 = stc_c.wxSTC_C_WORD2
wxSTC_C_COMMENTDOCKEYWORD = stc_c.wxSTC_C_COMMENTDOCKEYWORD
wxSTC_C_COMMENTDOCKEYWORDERROR = stc_c.wxSTC_C_COMMENTDOCKEYWORDERROR
wxSTC_C_GLOBALCLASS = stc_c.wxSTC_C_GLOBALCLASS
wxSTC_H_DEFAULT = stc_c.wxSTC_H_DEFAULT
wxSTC_H_TAG = stc_c.wxSTC_H_TAG
wxSTC_H_TAGUNKNOWN = stc_c.wxSTC_H_TAGUNKNOWN
@@ -1903,6 +1921,29 @@ wxSTC_POV_OPERATOR = stc_c.wxSTC_POV_OPERATOR
wxSTC_POV_IDENTIFIER = stc_c.wxSTC_POV_IDENTIFIER
wxSTC_POV_BRACE = stc_c.wxSTC_POV_BRACE
wxSTC_POV_WORD2 = stc_c.wxSTC_POV_WORD2
wxSTC_LOUT_DEFAULT = stc_c.wxSTC_LOUT_DEFAULT
wxSTC_LOUT_COMMENT = stc_c.wxSTC_LOUT_COMMENT
wxSTC_LOUT_NUMBER = stc_c.wxSTC_LOUT_NUMBER
wxSTC_LOUT_WORD = stc_c.wxSTC_LOUT_WORD
wxSTC_LOUT_WORD2 = stc_c.wxSTC_LOUT_WORD2
wxSTC_LOUT_WORD3 = stc_c.wxSTC_LOUT_WORD3
wxSTC_LOUT_WORD4 = stc_c.wxSTC_LOUT_WORD4
wxSTC_LOUT_STRING = stc_c.wxSTC_LOUT_STRING
wxSTC_LOUT_OPERATOR = stc_c.wxSTC_LOUT_OPERATOR
wxSTC_LOUT_IDENTIFIER = stc_c.wxSTC_LOUT_IDENTIFIER
wxSTC_LOUT_STRINGEOL = stc_c.wxSTC_LOUT_STRINGEOL
wxSTC_ESCRIPT_DEFAULT = stc_c.wxSTC_ESCRIPT_DEFAULT
wxSTC_ESCRIPT_COMMENT = stc_c.wxSTC_ESCRIPT_COMMENT
wxSTC_ESCRIPT_COMMENTLINE = stc_c.wxSTC_ESCRIPT_COMMENTLINE
wxSTC_ESCRIPT_COMMENTDOC = stc_c.wxSTC_ESCRIPT_COMMENTDOC
wxSTC_ESCRIPT_NUMBER = stc_c.wxSTC_ESCRIPT_NUMBER
wxSTC_ESCRIPT_WORD = stc_c.wxSTC_ESCRIPT_WORD
wxSTC_ESCRIPT_STRING = stc_c.wxSTC_ESCRIPT_STRING
wxSTC_ESCRIPT_OPERATOR = stc_c.wxSTC_ESCRIPT_OPERATOR
wxSTC_ESCRIPT_IDENTIFIER = stc_c.wxSTC_ESCRIPT_IDENTIFIER
wxSTC_ESCRIPT_BRACE = stc_c.wxSTC_ESCRIPT_BRACE
wxSTC_ESCRIPT_WORD2 = stc_c.wxSTC_ESCRIPT_WORD2
wxSTC_ESCRIPT_WORD3 = stc_c.wxSTC_ESCRIPT_WORD3
wxSTC_CMD_REDO = stc_c.wxSTC_CMD_REDO
wxSTC_CMD_SELECTALL = stc_c.wxSTC_CMD_SELECTALL
wxSTC_CMD_UNDO = stc_c.wxSTC_CMD_UNDO
wxPython/contrib/xrc/xrc.cpp
+1 -1
View File
@@ -56,7 +56,7 @@ extern PyObject *SWIG_newvarlink(void);
#include "wxPython.h"
#include "pyistream.h"
#include "wx/xrc/xml.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xmlres.h"
#include <wx/filesys.h>
#include <wx/fs_mem.h>
wxPython/contrib/xrc/xrc.i
+1 -1
View File
@@ -16,7 +16,7 @@
%{
#include "wxPython.h"
#include "pyistream.h"
#include "wx/xrc/xml.h"
#include "wx/xml/xml.h"
#include "wx/xrc/xmlres.h"
#include <wx/filesys.h>
#include <wx/fs_mem.h>
wxPython/setup.py
+110 -302
View File
File diff suppressed because it is too large Load Diff
wxPython/src/_defs.i
+54 -48
View File
@@ -236,16 +236,6 @@ enum {
wxRETAINED,
wxBACKINGSTORE,
wxTB_HORIZONTAL,
wxTB_VERTICAL,
wxTB_3DBUTTONS,
wxTB_FLAT,
wxTB_DOCKABLE,
wxTB_NOICONS,
wxTB_TEXT,
wxTB_NODIVIDER,
wxTB_NOALIGN,
wxCOLOURED,
wxFIXED_LENGTH,
wxALIGN_LEFT,
@@ -272,25 +262,6 @@ enum {
wxPROCESS_ENTER,
wxPASSWORD,
wxTE_READONLY,
wxTE_MULTILINE,
wxTE_PROCESS_TAB,
wxTE_RICH,
wxTE_RICH2,
wxTE_NO_VSCROLL,
wxTE_AUTO_SCROLL,
wxTE_PROCESS_ENTER,
wxTE_PASSWORD,
wxTE_AUTO_URL,
wxTE_NOHIDESEL,
wxTE_DONTWRAP,
wxTE_LINEWRAP,
wxTE_WORDWRAP,
wxTE_LEFT,
wxTE_RIGHT,
wxTE_CENTER,
wxTE_CENTRE,
wxCB_SIMPLE,
wxCB_DROPDOWN,
wxCB_SORT,
@@ -328,18 +299,6 @@ enum {
wxBU_BOTTOM,
wxBU_EXACTFIT,
wxSP_VERTICAL,
wxSP_HORIZONTAL,
wxSP_ARROW_KEYS,
wxSP_WRAP,
wxSP_NOBORDER,
wxSP_3D,
wxSP_3DSASH,
wxSP_3DBORDER,
wxSP_FULLSASH,
wxSP_BORDER,
wxSP_LIVE_UPDATE,
wxSP_PERMIT_UNSPLIT,
wxFLOOD_SURFACE,
wxFLOOD_BORDER,
wxODDEVEN_RULE,
@@ -418,6 +377,20 @@ enum {
wxID_DUPLICATE,
wxID_SELECTALL,
wxID_DELETE,
wxID_REPLACE,
wxID_REPLACE_ALL,
wxID_PROPERTIES,
wxID_VIEW_DETAILS,
wxID_VIEW_LARGEICONS,
wxID_VIEW_SMALLICONS,
wxID_VIEW_LIST,
wxID_VIEW_SORTDATE,
wxID_VIEW_SORTNAME,
wxID_VIEW_SORTSIZE,
wxID_VIEW_SORTTYPE,
wxID_FILE1,
wxID_FILE2,
wxID_FILE3,
@@ -492,13 +465,6 @@ enum {
wxGROW,
wxEXPAND,
wxNB_FIXEDWIDTH,
wxNB_TOP,
wxNB_LEFT,
wxNB_RIGHT,
wxNB_BOTTOM,
wxNB_MULTILINE,
wxLI_HORIZONTAL,
wxLI_VERTICAL,
@@ -514,6 +480,11 @@ enum {
wxWS_EX_BLOCK_EVENTS,
wxWS_EX_TRANSIENT,
wxWS_EX_THEMED_BACKGROUND,
wxWS_EX_PROCESS_IDLE,
wxWS_EX_PROCESS_UI_UPDATES,
// Mapping modes (as per Windows)
wxMM_TEXT,
wxMM_LOMETRIC,
@@ -939,6 +910,38 @@ enum wxHitTest
};
%{
#if ! wxUSE_HOTKEY
enum wxHotkeyModifier
{
wxMOD_NONE = 0,
wxMOD_ALT = 1,
wxMOD_CONTROL = 2,
wxMOD_SHIFT = 4,
wxMOD_WIN = 8
};
#define wxEVT_HOTKEY 9999
#endif
%}
enum wxHotkeyModifier
{
wxMOD_NONE = 0,
wxMOD_ALT = 1,
wxMOD_CONTROL = 2,
wxMOD_SHIFT = 4,
wxMOD_WIN = 8
};
enum wxUpdateUI
{
wxUPDATE_UI_NONE = 0x0000,
wxUPDATE_UI_RECURSE = 0x0001,
wxUPDATE_UI_FROMIDLE = 0x0002 // Invoked from On(Internal)Idle
};
//---------------------------------------------------------------------------
//---------------------------------------------------------------------------
@@ -1016,6 +1019,7 @@ enum wxEventType {
wxEVT_KEY_DOWN,
wxEVT_KEY_UP,
wxEVT_CHAR_HOOK,
wxEVT_HOTKEY,
/*
* Scrollbar event identifiers
@@ -1044,6 +1048,8 @@ enum wxEventType {
wxEVT_SIZE = wxEVT_FIRST + 200,
wxEVT_MOVE,
wxEVT_SIZING,
wxEVT_MOVING,
wxEVT_CLOSE_WINDOW,
wxEVT_END_SESSION,
wxEVT_QUERY_END_SESSION,
wxPython/src/_extras.py
+9 -23
View File
@@ -41,6 +41,12 @@ def EVT_SIZE(win, func):
def EVT_MOVE(win, func):
win.Connect(-1, -1, wxEVT_MOVE, func)
def EVT_SIZING(win, func):
win.Connect(-1, -1, wxEVT_SIZING, func)
def EVT_MOVING(win, func):
win.Connect(-1, -1, wxEVT_MOVING, func)
def EVT_CLOSE(win, func):
win.Connect(-1, -1, wxEVT_CLOSE_WINDOW, func)
@@ -62,6 +68,9 @@ def EVT_KEY_DOWN(win, func):
def EVT_KEY_UP(win, func):
win.Connect(-1, -1, wxEVT_KEY_UP, func)
def EVT_HOTKEY(win, func):
win.Connect(-1, -1, wxEVT_HOTKEY, func)
def EVT_MENU_OPEN(win, func):
win.Connect(-1, -1, wxEVT_MENU_OPEN, func)
@@ -486,29 +495,6 @@ def EVT_SPIN(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func)
# wxTaskBarIcon
def EVT_TASKBAR_MOVE(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func)
def EVT_TASKBAR_LEFT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func)
def EVT_TASKBAR_LEFT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func)
def EVT_TASKBAR_RIGHT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func)
def EVT_TASKBAR_RIGHT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func)
def EVT_TASKBAR_LEFT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func)
def EVT_TASKBAR_RIGHT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
# wxSashWindow
def EVT_SASH_DRAGGED(win, id, func):
win.Connect(id, -1, wxEVT_SASH_DRAGGED, func)
wxPython/src/cmndlgs.i
+33 -12
View File
@@ -114,21 +114,21 @@ public:
%pragma(python) addtomethod = "__init__:self._setOORInfo(self)"
wxString GetDirectory();
wxString GetFilename();
int GetFilterIndex();
wxString GetMessage();
wxString GetPath();
long GetStyle();
wxString GetWildcard();
void SetDirectory(const wxString& directory);
void SetFilename(const wxString& setfilename);
void SetFilterIndex(int filterIndex);
void SetMessage(const wxString& message);
void SetPath(const wxString& path);
void SetStyle(long style);
void SetDirectory(const wxString& dir);
void SetFilename(const wxString& name);
void SetWildcard(const wxString& wildCard);
int ShowModal();
void SetStyle(long style);
void SetFilterIndex(int filterIndex);
wxString GetMessage() const;
wxString GetPath() const;
wxString GetDirectory() const;
wxString GetFilename() const;
wxString GetWildcard() const;
long GetStyle() const;
int GetFilterIndex() const;
%addmethods {
PyObject* GetFilenames() {
@@ -143,6 +143,27 @@ public:
return wxArrayString2PyList_helper(arr);
}
}
// TODO
// // Utility functions
// // Parses the wildCard, returning the number of filters.
// // Returns 0 if none or if there's a problem,
// // The arrays will contain an equal number of items found before the error.
// // wildCard is in the form:
// // "All files (*)|*|Image Files (*.jpeg *.png)|*.jpg;*.png"
// static int ParseWildcard(const wxString& wildCard,
// wxArrayString& descriptions,
// wxArrayString& filters);
// // Append first extension to filePath from a ';' separated extensionList
// // if filePath = "path/foo.bar" just return it as is
// // if filePath = "foo[.]" and extensionList = "*.jpg;*.png" return "foo.jpg"
// // if the extension is "*.j?g" (has wildcards) or "jpg" then return filePath
// static wxString AppendExtension(const wxString &filePath,
// const wxString &extensionList);
};
wxPython/src/controls.i
+71 -1
View File
@@ -720,6 +720,56 @@ public:
//----------------------------------------------------------------------
enum {
// Styles
wxTE_NO_VSCROLL,
wxTE_AUTO_SCROLL,
wxTE_READONLY,
wxTE_MULTILINE,
wxTE_PROCESS_TAB,
wxTE_LEFT,
wxTE_CENTER,
wxTE_RIGHT,
wxTE_CENTRE,
wxTE_RICH,
wxTE_PROCESS_ENTER,
wxTE_PASSWORD,
wxTE_AUTO_URL,
wxTE_NOHIDESEL,
wxTE_DONTWRAP,
wxTE_LINEWRAP,
wxTE_WORDWRAP,
wxTE_RICH2,
// Flags to indicate which attributes are being applied
wxTEXT_ATTR_TEXT_COLOUR,
wxTEXT_ATTR_BACKGROUND_COLOUR,
wxTEXT_ATTR_FONT_FACE,
wxTEXT_ATTR_FONT_SIZE,
wxTEXT_ATTR_FONT_WEIGHT,
wxTEXT_ATTR_FONT_ITALIC,
wxTEXT_ATTR_FONT_UNDERLINE,
wxTEXT_ATTR_FONT,
wxTEXT_ATTR_ALIGNMENT,
wxTEXT_ATTR_LEFT_INDENT,
wxTEXT_ATTR_RIGHT_INDENT,
wxTEXT_ATTR_TABS,
};
enum wxTextAttrAlignment
{
wxTEXT_ALIGNMENT_DEFAULT,
wxTEXT_ALIGNMENT_LEFT,
wxTEXT_ALIGNMENT_CENTRE,
wxTEXT_ALIGNMENT_CENTER,
wxTEXT_ALIGNMENT_RIGHT,
wxTEXT_ALIGNMENT_JUSTIFIED
};
class wxTextAttr
{
@@ -727,22 +777,41 @@ public:
// ctors
wxTextAttr(const wxColour& colText = wxNullColour,
const wxColour& colBack = wxNullColour,
const wxFont& font = wxNullFont);
const wxFont& font = wxNullFont,
wxTextAttrAlignment alignment = wxTEXT_ALIGNMENT_DEFAULT);
~wxTextAttr();
void Init();
// setters
void SetTextColour(const wxColour& colText);
void SetBackgroundColour(const wxColour& colBack);
void SetFont(const wxFont& font);
void SetAlignment(wxTextAttrAlignment alignment);
void SetTabs(const wxArrayInt& tabs);
void SetLeftIndent(int indent);
void SetRightIndent(int indent);
void SetFlags(long flags);
// accessors
bool HasTextColour() const;
bool HasBackgroundColour() const;
bool HasFont() const;
bool HasAlignment() const;
bool HasTabs() const;
bool HasLeftIndent() const;
bool HasRightIndent() const;
bool HasFlag(long flag) const;
wxColour GetTextColour() const;
wxColour GetBackgroundColour() const;
wxFont GetFont() const;
wxTextAttrAlignment GetAlignment();
const wxArrayInt& GetTabs() const;
long GetLeftIndent() const;
long GetRightIndent() const;
long GetFlags() const;
// returns false if we have any attributes set, true otherwise
bool IsDefault();
@@ -826,6 +895,7 @@ public:
bool SetStyle(long start, long end, const wxTextAttr& style);
bool SetDefaultStyle(const wxTextAttr& style);
const wxTextAttr& GetDefaultStyle() const;
bool GetStyle(long position, wxTextAttr& style);
// translate between the position (which is just an index in the text ctrl
// considering all its contents as a single strings) and (x, y) coordinates
wxPython/src/controls2.i
+71 -22
View File
@@ -840,31 +840,34 @@ public:
};
//----------------------------------------------------------------------
//--------------------------------------------------------------------------------
//--------------------------------------------------------------------------------
// wxTreeCtrl flags
enum {
wxTR_NO_BUTTONS,
wxTR_HAS_BUTTONS,
wxTR_TWIST_BUTTONS,
wxTR_NO_LINES,
wxTR_MAC_BUTTONS,
wxTR_AQUA_BUTTONS,
wxTR_LINES_AT_ROOT,
wxTR_SINGLE,
wxTR_MULTIPLE,
wxTR_EXTENDED,
wxTR_FULL_ROW_HIGHLIGHT,
wxTR_EDIT_LABELS,
wxTR_LINES_AT_ROOT,
wxTR_HIDE_ROOT,
wxTR_ROW_LINES,
wxTR_HAS_VARIABLE_ROW_HEIGHT,
wxTR_EDIT_LABELS,
wxTR_HIDE_ROOT,
wxTR_ROW_LINES,
wxTR_FULL_ROW_HIGHLIGHT,
wxTR_DEFAULT_STYLE,
wxTR_TWIST_BUTTONS,
wxTR_MAC_BUTTONS,
wxTR_AQUA_BUTTONS,
};
enum wxTreeItemIcon
{
wxTreeItemIcon_Normal, // not selected, not expanded
@@ -914,6 +917,7 @@ enum {
wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK,
wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK,
wxEVT_COMMAND_TREE_END_DRAG,
wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK,
};
@@ -925,9 +929,6 @@ def EVT_TREE_BEGIN_DRAG(win, id, func):
def EVT_TREE_BEGIN_RDRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
def EVT_TREE_END_DRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
@@ -972,9 +973,19 @@ def EVT_TREE_ITEM_RIGHT_CLICK(win, id, func):
def EVT_TREE_ITEM_MIDDLE_CLICK(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, func)
def EVT_TREE_END_DRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
def EVT_TREE_STATE_IMAGE_CLICK(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, func)
"
typedef void *wxTreeItemIdValue;
class wxTreeItemAttr
{
public:
@@ -1022,7 +1033,7 @@ public:
%name(wxTreeItemData) class wxPyTreeItemData : public wxObject {
%name(wxTreeItemData) class wxPyTreeItemData {
public:
wxPyTreeItemData(PyObject* obj = NULL);
@@ -1039,20 +1050,34 @@ class wxTreeEvent : public wxNotifyEvent {
public:
wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
wxTreeItemId GetItem();
wxTreeItemId GetOldItem();
wxPoint GetPoint();
const wxKeyEvent& GetKeyEvent();
int GetKeyCode();
%pragma(python) addtoclass = "GetCode = GetKeyCode"
const wxString& GetLabel();
bool IsEditCancelled() const;
// get the item on which the operation was performed or the newly
// selected item for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events
wxTreeItemId GetItem() const;
void SetItem(const wxTreeItemId& item);
// for wxEVT_COMMAND_TREE_SEL_CHANGED/ING events, get the previously
// selected item
wxTreeItemId GetOldItem() const;
void SetOldItem(const wxTreeItemId& item);
// the point where the mouse was when the drag operation started (for
// wxEVT_COMMAND_TREE_BEGIN_(R)DRAG events only) or click position
wxPoint GetPoint() const;
void SetPoint(const wxPoint& pt);
// keyboard data (for wxEVT_COMMAND_TREE_KEY_DOWN only)
const wxKeyEvent& GetKeyEvent() const;
int GetKeyCode() const;
void SetKeyEvent(const wxKeyEvent& evt);
// label (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
const wxString& GetLabel() const;
void SetLabel(const wxString& label);
// edit cancel flag (for EVT_TREE_{BEGIN|END}_LABEL_EDIT only)
bool IsEditCancelled() const;
void SetEditCanceled(bool editCancelled);
};
@@ -1473,6 +1498,30 @@ public:
};
class wxFileIconsTable
{
public:
wxFileIconsTable();
~wxFileIconsTable();
enum iconId_Type
{
folder,
folder_open,
computer,
drive,
cdrom,
floppy,
removeable,
file,
executable
};
int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
wxImageList *GetSmallImageList();
};
//----------------------------------------------------------------------
//----------------------------------------------------------------------
wxPython/src/events.i
+125 -8
View File
@@ -30,9 +30,20 @@
//---------------------------------------------------------------------------
enum Propagation_state
{
// don't propagate it at all
wxEVENT_PROPAGATE_NONE = 0,
// propagate it until it is processed
wxEVENT_PROPAGATE_MAX = INT_MAX
};
int wxNewEventType();
class wxEvent : public wxObject {
public:
// wxEvent(int id = 0); // *** This class is now an ABC
@@ -41,15 +52,52 @@ public:
wxObject* GetEventObject();
wxEventType GetEventType();
int GetId();
bool GetSkipped();
long GetTimestamp();
void SetEventObject(wxObject* object);
void SetEventType(wxEventType typ);
void SetId(int id);
void SetTimestamp(long timeStamp);
void Skip(bool skip = TRUE);
wxEvent *Clone();
bool IsCommandEvent() const;
// Can instruct event processor that we wish to ignore this event
// (treat as if the event table entry had not been found): this must be done
// to allow the event processing by the base classes (calling event.Skip()
// is the analog of calling the base class verstion of a virtual function)
void Skip(bool skip = TRUE);
bool GetSkipped() const;
// Determine if this event should be propagating to the parent window.
bool ShouldPropagate() const;
// Stop an event from propagating to its parent window, returns the old
// propagation level value
int StopPropagation();
// Resume the event propagation by restoring the propagation level
// (returned by StopPropagation())
void ResumePropagation(int propagationLevel);
wxEvent *Clone();
};
//---------------------------------------------------------------------------
// Helper class to temporarily change an event not to propagate.
class wxPropagationDisabler
{
public:
wxPropagationDisabler(wxEvent& event);
~wxPropagationDisabler();
};
// Another one to temporarily lower propagation level.
class wxPropagateOnce
{
public:
wxPropagateOnce(wxEvent& event);
~wxPropagateOnce();
};
//---------------------------------------------------------------------------
@@ -58,6 +106,8 @@ class wxSizeEvent : public wxEvent {
public:
wxSizeEvent(const wxSize& sz, int id = 0);
wxSize GetSize();
wxRect GetRect() const;
void SetRect(wxRect rect);
};
//---------------------------------------------------------------------------
@@ -273,8 +323,9 @@ public:
class wxMoveEvent: public wxEvent {
public:
wxMoveEvent(const wxPoint& pt, int id = 0);
wxPoint GetPosition();
wxRect GetRect() const;
void SetRect(wxRect rect);
};
//---------------------------------------------------------------------------
@@ -298,7 +349,7 @@ public:
class wxFocusEvent: public wxEvent {
public:
wxFocusEvent(WXTYPE eventType = 0, int id = 0);
wxFocusEvent(int eventType = 0, int id = 0);
};
//---------------------------------------------------------------------------
@@ -317,7 +368,7 @@ public:
class wxActivateEvent: public wxEvent{
public:
wxActivateEvent(WXTYPE eventType = 0, int active = TRUE, int id = 0);
wxActivateEvent(int eventType = 0, int active = TRUE, int id = 0);
bool GetActive();
};
@@ -332,9 +383,10 @@ public:
class wxMenuEvent: public wxEvent {
public:
wxMenuEvent(WXTYPE id = 0, int id = 0);
wxMenuEvent(int id = 0, int winid = 0, wxMenu* menu = NULL);
int GetMenuId();
bool IsPopup();
wxMenu* GetMenu() const;
};
//---------------------------------------------------------------------------
@@ -419,15 +471,57 @@ public:
//---------------------------------------------------------------------------
// Whether to always send idle events to windows, or
// to only send update events to those with the
// wxWS_EX_PROCESS_IDLE style.
enum wxIdleMode
{
// Send idle events to all windows
wxIDLE_PROCESS_ALL,
// Send idle events to windows that have
// the wxWS_EX_PROCESS_IDLE flag specified
wxIDLE_PROCESS_SPECIFIED
};
class wxIdleEvent: public wxEvent {
public:
wxIdleEvent();
void RequestMore(bool needMore = TRUE);
bool MoreRequested();
// Specify how wxWindows will send idle events: to
// all windows, or only to those which specify that they
// will process the events.
static void SetMode(wxIdleMode mode) { sm_idleMode = mode; }
// Returns the idle event mode
static wxIdleMode GetMode() { return sm_idleMode ; }
// Can we send an idle event?
static bool CanSend(wxWindow* win) ;
};
//---------------------------------------------------------------------------
// Whether to always send update events to windows, or
// to only send update events to those with the
// wxWS_EX_PROCESS_UI_UPDATES style.
enum wxUpdateUIMode
{
// Send UI update events to all windows
wxUPDATE_UI_PROCESS_ALL,
// Send UI update events to windows that have
// the wxWS_EX_PROCESS_UI_UPDATES flag specified
wxUPDATE_UI_PROCESS_SPECIFIED
};
class wxUpdateUIEvent: public wxEvent {
public:
wxUpdateUIEvent(wxWindowID commandId = 0);
@@ -441,6 +535,29 @@ public:
void Check(bool check);
void Enable(bool enable);
void SetText(const wxString& text);
// Sets the interval between updates in milliseconds.
// Set to -1 to disable updates, or to 0 to update as frequently as possible.
static void SetUpdateInterval(long updateInterval);
// Returns the current interval between updates in milliseconds
static long GetUpdateInterval();
// Can we update this window?
static bool CanUpdate(wxWindow* win);
// Reset the update time to provide a delay until the next
// time we should update
static void ResetUpdateTime();
// Specify how wxWindows will send update events: to
// all windows, or only to those which specify that they
// will process the events.
static void SetMode(wxUpdateUIMode mode);
// Returns the UI update mode
static wxUpdateUIMode GetMode();
};
//---------------------------------------------------------------------------
@@ -550,7 +667,7 @@ public:
class wxPyEvent : public wxEvent {
public:
wxPyEvent(int id=0);
wxPyEvent(int winid=0, wxEventType commandType = wxEVT_NULL );
~wxPyEvent();
%pragma(python) addtomethod = "__init__:self.SetSelf(self)"
wxPython/src/fonts.i
+40 -37
View File
@@ -249,13 +249,40 @@ public:
static wxFontMapper *Set(wxFontMapper *mapper);
// find an alternative for the given encoding (which is supposed to not be
// available on this system). If successful, return TRUE and rwxFontEcoding
// that can be used it wxFont ctor otherwise return FALSE
//bool GetAltForEncoding(wxFontEncoding encoding,
// wxFontEncoding *alt_encoding,
// const wxString& facename = wxPyEmptyString,
// bool interactive = TRUE);
// returns the encoding for the given charset (in the form of RFC 2046) or
// wxFONTENCODING_SYSTEM if couldn't decode it
//
// interactive parameter is ignored in the base class, we behave as if it
// were always false
virtual wxFontEncoding CharsetToEncoding(const wxString& charset,
bool interactive = true);
// get the number of font encodings we know about
static size_t GetSupportedEncodingsCount();
// get the n-th supported encoding
static wxFontEncoding GetEncoding(size_t n);
// return internal string identifier for the encoding (see also
// GetEncodingDescription())
static wxString GetEncodingName(wxFontEncoding encoding);
// return user-readable string describing the given encoding
//
// NB: hard-coded now, but might change later (read it from config?)
static wxString GetEncodingDescription(wxFontEncoding encoding);
// set the config object to use (may be NULL to use default)
void SetConfig(wxConfigBase *config);
// set the root config path to use (should be an absolute path)
void SetConfigPath(const wxString& prefix);
// return default config path
static const wxChar *GetDefaultConfigPath();
// Find an alternative for the given encoding (which is supposed to not be
@@ -281,40 +308,12 @@ public:
bool IsEncodingAvailable(wxFontEncoding encoding,
const wxString& facename = wxPyEmptyString);
// returns the encoding for the given charset (in the form of RFC 2046) or
// wxFONTENCODING_SYSTEM if couldn't decode it
wxFontEncoding CharsetToEncoding(const wxString& charset,
bool interactive = TRUE);
// return internal string identifier for the encoding (see also
// GetEncodingDescription())
static wxString GetEncodingName(wxFontEncoding encoding);
// return user-readable string describing the given encoding
//
// NB: hard-coded now, but might change later (read it from config?)
static wxString GetEncodingDescription(wxFontEncoding encoding);
// the parent window for modal dialogs
void SetDialogParent(wxWindow *parent);
void SetDialogParent(wxWindow *parent) { m_windowParent = parent; }
// the title for the dialogs (note that default is quite reasonable)
void SetDialogTitle(const wxString& title);
void SetDialogTitle(const wxString& title) { m_titleDialog = title; }
// functions which allow to configure the config object used: by default,
// the global one (from wxConfigBase::Get() will be used) and the default
// root path for the config settings is the string returned by
// GetDefaultConfigPath()
// set the config object to use (may be NULL to use default)
void SetConfig(wxConfigBase *config);
// set the root config path to use (should be an absolute path)
void SetConfigPath(const wxString& prefix);
// return default config path
static wxString GetDefaultConfigPath();
};
@@ -806,6 +805,10 @@ public:
// Returns NULL if no info found, pointer must *not* be deleted by caller
static const wxLanguageInfo *GetLanguageInfo(int lang);
// Returns language name in English or empty string if the language
// is not in database
static wxString GetLanguageName(int lang);
// Find the language for the given locale string which may be either a
// canonical ISO 2 letter language code ("xx"), a language code followed by
// the country code ("xx_XX") or a Windows full language name ("Xxxxx...")
wxPython/src/frames.i
+9 -1
View File
@@ -183,7 +183,7 @@ public:
// create main toolbar
virtual wxToolBar* CreateToolBar(long style = wxNO_BORDER|wxTB_HORIZONTAL,
virtual wxToolBar* CreateToolBar(long style = -1, //wxNO_BORDER|wxTB_HORIZONTAL,
wxWindowID id = -1,
const wxString& name = wxPyToolBarNameStr);
@@ -194,6 +194,14 @@ public:
// sends a size event to the window using its current size -- this has an
// effect of refreshing the window layout
virtual void SendSizeEvent();
// send wxUpdateUIEvents for all menu items in the menubar,
// or just for menu if non-NULL
void DoMenuUpdates(wxMenu* menu = NULL);
// do the UI update processing for this window
virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE);
};
//---------------------------------------------------------------------------
wxPython/src/gdi.i
+69
View File
@@ -21,6 +21,7 @@
#include <wx/fontmap.h>
#include <wx/fontutil.h>
#include <wx/dcbuffer.h>
#include <wx/dcmirror.h>
#include <wx/iconbndl.h>
%}
@@ -242,6 +243,7 @@ public:
%new wxIcon* wxEmptyIcon();
%new wxIcon* wxIconFromXPMData(PyObject* listOfStrings);
%new wxIcon* wxIconFromBitmap(const wxBitmap& bmp);
%new wxIcon* wxIconFromLocation(const wxIconLocation& loc);
%{ // Implementations of some alternate "constructors"
wxIcon* wxEmptyIcon() {
@@ -265,8 +267,61 @@ public:
icon->CopyFromBitmap(bmp);
return icon;
}
wxIcon* wxIconFromLocation(const wxIconLocation& loc) {
wxIcon* icon = new wxIcon(loc);
return icon;
}
%}
//---------------------------------------------------------------------------
class wxIconLocation
{
public:
// ctor takes the name of the file where the icon is
%addmethods {
wxIconLocation(const wxString* filename = &wxPyEmptyString, int num = 0) {
#ifdef __WXMSW__
return new wxIconLocation(*filename, num);
#else
return new wxIconLocation(*filename);
#endif
}
}
~wxIconLocation();
// returns true if this object is valid/initialized
bool IsOk() const;
// set/get the icon file name
void SetFileName(const wxString& filename);
const wxString& GetFileName() const;
%addmethods {
void SetIndex(int num) {
#ifdef __WXMSW__
self->SetIndex(num);
#else
// do nothing
#endif
}
int GetIndex() {
#ifdef __WXMSW__
return self->GetIndex();
#else
return -1;
#endif
}
}
};
//---------------------------------------------------------------------------
class wxIconBundle
@@ -967,6 +1022,20 @@ public:
//---------------------------------------------------------------------------
class wxMirrorDC : public wxDC
{
public:
// constructs a mirror DC associated with the given real DC
//
// if mirror parameter is true, all vertical and horizontal coordinates are
// exchanged, otherwise this class behaves in exactly the same way as a
// plain DC
//
wxMirrorDC(wxDC& dc, bool mirror);
};
//---------------------------------------------------------------------------
#ifdef __WXMSW__
wxPython/src/grid.i
+2 -1
View File
@@ -1023,7 +1023,7 @@ public:
void SetFont(const wxFont& font);
void SetAlignment(int hAlign, int vAlign);
void SetSize(int num_rows, int num_cols);
void SetOverflow( bool allow );
void SetOverflow( bool allow = TRUE );
void SetReadOnly(bool isReadOnly = TRUE);
void SetRenderer(wxGridCellRenderer *renderer);
@@ -1037,6 +1037,7 @@ public:
bool HasRenderer() const;
bool HasEditor() const;
bool HasReadWriteMode() const;
bool HasOverflowMode() const;
wxColour GetTextColour() const;
wxColour GetBackgroundColour() const;
wxPython/src/gtk/cmndlgs.cpp
+343 -372
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/cmndlgs.py
+28 -31
View File
@@ -136,26 +136,11 @@ class wxFileDialogPtr(wxDialogPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def GetDirectory(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetDirectory(self, *_args, **_kwargs)
def SetMessage(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetMessage(self, *_args, **_kwargs)
return val
def GetFilename(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetFilename(self, *_args, **_kwargs)
return val
def GetFilterIndex(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetFilterIndex(self, *_args, **_kwargs)
return val
def GetMessage(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetMessage(self, *_args, **_kwargs)
return val
def GetPath(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetPath(self, *_args, **_kwargs)
return val
def GetStyle(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetStyle(self, *_args, **_kwargs)
return val
def GetWildcard(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetWildcard(self, *_args, **_kwargs)
def SetPath(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetPath(self, *_args, **_kwargs)
return val
def SetDirectory(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetDirectory(self, *_args, **_kwargs)
@@ -163,23 +148,35 @@ class wxFileDialogPtr(wxDialogPtr):
def SetFilename(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetFilename(self, *_args, **_kwargs)
return val
def SetFilterIndex(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetFilterIndex(self, *_args, **_kwargs)
return val
def SetMessage(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetMessage(self, *_args, **_kwargs)
return val
def SetPath(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetPath(self, *_args, **_kwargs)
def SetWildcard(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetWildcard(self, *_args, **_kwargs)
return val
def SetStyle(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetStyle(self, *_args, **_kwargs)
return val
def SetWildcard(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetWildcard(self, *_args, **_kwargs)
def SetFilterIndex(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_SetFilterIndex(self, *_args, **_kwargs)
return val
def ShowModal(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_ShowModal(self, *_args, **_kwargs)
def GetMessage(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetMessage(self, *_args, **_kwargs)
return val
def GetPath(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetPath(self, *_args, **_kwargs)
return val
def GetDirectory(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetDirectory(self, *_args, **_kwargs)
return val
def GetFilename(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetFilename(self, *_args, **_kwargs)
return val
def GetWildcard(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetWildcard(self, *_args, **_kwargs)
return val
def GetStyle(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetStyle(self, *_args, **_kwargs)
return val
def GetFilterIndex(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetFilterIndex(self, *_args, **_kwargs)
return val
def GetFilenames(self, *_args, **_kwargs):
val = cmndlgsc.wxFileDialog_GetFilenames(self, *_args, **_kwargs)
wxPython/src/gtk/controls.cpp
+578 -4
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/controls.py
+87
View File
@@ -604,6 +604,9 @@ class wxTextAttrPtr :
delfunc(self)
except:
pass
def Init(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_Init(self, *_args, **_kwargs)
return val
def SetTextColour(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_SetTextColour(self, *_args, **_kwargs)
return val
@@ -613,6 +616,21 @@ class wxTextAttrPtr :
def SetFont(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_SetFont(self, *_args, **_kwargs)
return val
def SetAlignment(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_SetAlignment(self, *_args, **_kwargs)
return val
def SetTabs(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_SetTabs(self, *_args, **_kwargs)
return val
def SetLeftIndent(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_SetLeftIndent(self, *_args, **_kwargs)
return val
def SetRightIndent(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_SetRightIndent(self, *_args, **_kwargs)
return val
def SetFlags(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_SetFlags(self, *_args, **_kwargs)
return val
def HasTextColour(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_HasTextColour(self, *_args, **_kwargs)
return val
@@ -622,6 +640,21 @@ class wxTextAttrPtr :
def HasFont(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_HasFont(self, *_args, **_kwargs)
return val
def HasAlignment(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_HasAlignment(self, *_args, **_kwargs)
return val
def HasTabs(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_HasTabs(self, *_args, **_kwargs)
return val
def HasLeftIndent(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_HasLeftIndent(self, *_args, **_kwargs)
return val
def HasRightIndent(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_HasRightIndent(self, *_args, **_kwargs)
return val
def HasFlag(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_HasFlag(self, *_args, **_kwargs)
return val
def GetTextColour(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_GetTextColour(self, *_args, **_kwargs)
if val: val = wxColourPtr(val) ; val.thisown = 1
@@ -634,6 +667,21 @@ class wxTextAttrPtr :
val = controlsc.wxTextAttr_GetFont(self, *_args, **_kwargs)
if val: val = wxFontPtr(val) ; val.thisown = 1
return val
def GetAlignment(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_GetAlignment(self, *_args, **_kwargs)
return val
def GetTabs(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_GetTabs(self, *_args, **_kwargs)
return val
def GetLeftIndent(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_GetLeftIndent(self, *_args, **_kwargs)
return val
def GetRightIndent(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_GetRightIndent(self, *_args, **_kwargs)
return val
def GetFlags(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_GetFlags(self, *_args, **_kwargs)
return val
def IsDefault(self, *_args, **_kwargs):
val = controlsc.wxTextAttr_IsDefault(self, *_args, **_kwargs)
return val
@@ -724,6 +772,9 @@ class wxTextCtrlPtr(wxControlPtr):
val = controlsc.wxTextCtrl_GetDefaultStyle(self, *_args, **_kwargs)
if val: val = wxTextAttrPtr(val)
return val
def GetStyle(self, *_args, **_kwargs):
val = controlsc.wxTextCtrl_GetStyle(self, *_args, **_kwargs)
return val
def XYToPosition(self, *_args, **_kwargs):
val = controlsc.wxTextCtrl_XYToPosition(self, *_args, **_kwargs)
return val
@@ -1205,4 +1256,40 @@ def wxTextAttr_Combine(*_args, **_kwargs):
cvar = controlsc.cvar
wxDefaultValidator = wxValidatorPtr(controlsc.cvar.wxDefaultValidator)
wxTE_NO_VSCROLL = controlsc.wxTE_NO_VSCROLL
wxTE_AUTO_SCROLL = controlsc.wxTE_AUTO_SCROLL
wxTE_READONLY = controlsc.wxTE_READONLY
wxTE_MULTILINE = controlsc.wxTE_MULTILINE
wxTE_PROCESS_TAB = controlsc.wxTE_PROCESS_TAB
wxTE_LEFT = controlsc.wxTE_LEFT
wxTE_CENTER = controlsc.wxTE_CENTER
wxTE_RIGHT = controlsc.wxTE_RIGHT
wxTE_CENTRE = controlsc.wxTE_CENTRE
wxTE_RICH = controlsc.wxTE_RICH
wxTE_PROCESS_ENTER = controlsc.wxTE_PROCESS_ENTER
wxTE_PASSWORD = controlsc.wxTE_PASSWORD
wxTE_AUTO_URL = controlsc.wxTE_AUTO_URL
wxTE_NOHIDESEL = controlsc.wxTE_NOHIDESEL
wxTE_DONTWRAP = controlsc.wxTE_DONTWRAP
wxTE_LINEWRAP = controlsc.wxTE_LINEWRAP
wxTE_WORDWRAP = controlsc.wxTE_WORDWRAP
wxTE_RICH2 = controlsc.wxTE_RICH2
wxTEXT_ATTR_TEXT_COLOUR = controlsc.wxTEXT_ATTR_TEXT_COLOUR
wxTEXT_ATTR_BACKGROUND_COLOUR = controlsc.wxTEXT_ATTR_BACKGROUND_COLOUR
wxTEXT_ATTR_FONT_FACE = controlsc.wxTEXT_ATTR_FONT_FACE
wxTEXT_ATTR_FONT_SIZE = controlsc.wxTEXT_ATTR_FONT_SIZE
wxTEXT_ATTR_FONT_WEIGHT = controlsc.wxTEXT_ATTR_FONT_WEIGHT
wxTEXT_ATTR_FONT_ITALIC = controlsc.wxTEXT_ATTR_FONT_ITALIC
wxTEXT_ATTR_FONT_UNDERLINE = controlsc.wxTEXT_ATTR_FONT_UNDERLINE
wxTEXT_ATTR_FONT = controlsc.wxTEXT_ATTR_FONT
wxTEXT_ATTR_ALIGNMENT = controlsc.wxTEXT_ATTR_ALIGNMENT
wxTEXT_ATTR_LEFT_INDENT = controlsc.wxTEXT_ATTR_LEFT_INDENT
wxTEXT_ATTR_RIGHT_INDENT = controlsc.wxTEXT_ATTR_RIGHT_INDENT
wxTEXT_ATTR_TABS = controlsc.wxTEXT_ATTR_TABS
wxTEXT_ALIGNMENT_DEFAULT = controlsc.wxTEXT_ALIGNMENT_DEFAULT
wxTEXT_ALIGNMENT_LEFT = controlsc.wxTEXT_ALIGNMENT_LEFT
wxTEXT_ALIGNMENT_CENTRE = controlsc.wxTEXT_ALIGNMENT_CENTRE
wxTEXT_ALIGNMENT_CENTER = controlsc.wxTEXT_ALIGNMENT_CENTER
wxTEXT_ALIGNMENT_RIGHT = controlsc.wxTEXT_ALIGNMENT_RIGHT
wxTEXT_ALIGNMENT_JUSTIFIED = controlsc.wxTEXT_ALIGNMENT_JUSTIFIED
wxEVT_COMMAND_TOGGLEBUTTON_CLICKED = controlsc.wxEVT_COMMAND_TOGGLEBUTTON_CLICKED
wxPython/src/gtk/controls2.cpp
+329 -191
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/controls2.py
+65 -26
View File
@@ -90,9 +90,6 @@ def EVT_TREE_BEGIN_DRAG(win, id, func):
def EVT_TREE_BEGIN_RDRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_RDRAG, func)
def EVT_TREE_END_DRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
def EVT_TREE_BEGIN_LABEL_EDIT(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, func)
@@ -138,6 +135,13 @@ def EVT_TREE_ITEM_RIGHT_CLICK(win, id, func):
def EVT_TREE_ITEM_MIDDLE_CLICK(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK, func)
def EVT_TREE_END_DRAG(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_END_DRAG, func)
def EVT_TREE_STATE_IMAGE_CLICK(win, id, func):
win.Connect(id, -1, wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK, func)
class wxListItemAttrPtr :
def __init__(self,this):
self.this = this
@@ -844,7 +848,7 @@ class wxTreeItemId(wxTreeItemIdPtr):
class wxTreeItemDataPtr(wxObjectPtr):
class wxTreeItemDataPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
@@ -879,14 +883,23 @@ class wxTreeEventPtr(wxNotifyEventPtr):
val = controls2c.wxTreeEvent_GetItem(self, *_args, **_kwargs)
if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
return val
def SetItem(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetItem(self, *_args, **_kwargs)
return val
def GetOldItem(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_GetOldItem(self, *_args, **_kwargs)
if val: val = wxTreeItemIdPtr(val) ; val.thisown = 1
return val
def SetOldItem(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetOldItem(self, *_args, **_kwargs)
return val
def GetPoint(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_GetPoint(self, *_args, **_kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def SetPoint(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetPoint(self, *_args, **_kwargs)
return val
def GetKeyEvent(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_GetKeyEvent(self, *_args, **_kwargs)
if val: val = wxKeyEventPtr(val)
@@ -894,33 +907,23 @@ class wxTreeEventPtr(wxNotifyEventPtr):
def GetKeyCode(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_GetKeyCode(self, *_args, **_kwargs)
return val
def GetLabel(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_GetLabel(self, *_args, **_kwargs)
return val
def IsEditCancelled(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_IsEditCancelled(self, *_args, **_kwargs)
return val
def SetItem(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetItem(self, *_args, **_kwargs)
return val
def SetOldItem(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetOldItem(self, *_args, **_kwargs)
return val
def SetPoint(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetPoint(self, *_args, **_kwargs)
return val
def SetKeyEvent(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetKeyEvent(self, *_args, **_kwargs)
return val
def GetLabel(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_GetLabel(self, *_args, **_kwargs)
return val
def SetLabel(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetLabel(self, *_args, **_kwargs)
return val
def IsEditCancelled(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_IsEditCancelled(self, *_args, **_kwargs)
return val
def SetEditCanceled(self, *_args, **_kwargs):
val = controls2c.wxTreeEvent_SetEditCanceled(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxTreeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
GetCode = GetKeyCode
class wxTreeEvent(wxTreeEventPtr):
def __init__(self,*_args,**_kwargs):
self.this = controls2c.new_wxTreeEvent(*_args,**_kwargs)
@@ -1349,6 +1352,41 @@ def wxPreDirFilterListCtrl(*_args,**_kwargs):
return val
class wxFileIconsTablePtr :
folder = controls2c.wxFileIconsTable_folder
folder_open = controls2c.wxFileIconsTable_folder_open
computer = controls2c.wxFileIconsTable_computer
drive = controls2c.wxFileIconsTable_drive
cdrom = controls2c.wxFileIconsTable_cdrom
floppy = controls2c.wxFileIconsTable_floppy
removeable = controls2c.wxFileIconsTable_removeable
file = controls2c.wxFileIconsTable_file
executable = controls2c.wxFileIconsTable_executable
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self, delfunc=controls2c.delete_wxFileIconsTable):
if self.thisown == 1:
try:
delfunc(self)
except:
pass
def GetIconID(self, *_args, **_kwargs):
val = controls2c.wxFileIconsTable_GetIconID(self, *_args, **_kwargs)
return val
def GetSmallImageList(self, *_args, **_kwargs):
val = controls2c.wxFileIconsTable_GetSmallImageList(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxFileIconsTable instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxFileIconsTable(wxFileIconsTablePtr):
def __init__(self,*_args,**_kwargs):
self.this = controls2c.new_wxFileIconsTable(*_args,**_kwargs)
self.thisown = 1
#-------------- FUNCTION WRAPPERS ------------------
@@ -1445,20 +1483,20 @@ wxLIST_FORMAT_CENTRE = controls2c.wxLIST_FORMAT_CENTRE
wxLIST_FORMAT_CENTER = controls2c.wxLIST_FORMAT_CENTER
wxTR_NO_BUTTONS = controls2c.wxTR_NO_BUTTONS
wxTR_HAS_BUTTONS = controls2c.wxTR_HAS_BUTTONS
wxTR_TWIST_BUTTONS = controls2c.wxTR_TWIST_BUTTONS
wxTR_NO_LINES = controls2c.wxTR_NO_LINES
wxTR_MAC_BUTTONS = controls2c.wxTR_MAC_BUTTONS
wxTR_AQUA_BUTTONS = controls2c.wxTR_AQUA_BUTTONS
wxTR_LINES_AT_ROOT = controls2c.wxTR_LINES_AT_ROOT
wxTR_SINGLE = controls2c.wxTR_SINGLE
wxTR_MULTIPLE = controls2c.wxTR_MULTIPLE
wxTR_EXTENDED = controls2c.wxTR_EXTENDED
wxTR_FULL_ROW_HIGHLIGHT = controls2c.wxTR_FULL_ROW_HIGHLIGHT
wxTR_HAS_VARIABLE_ROW_HEIGHT = controls2c.wxTR_HAS_VARIABLE_ROW_HEIGHT
wxTR_EDIT_LABELS = controls2c.wxTR_EDIT_LABELS
wxTR_LINES_AT_ROOT = controls2c.wxTR_LINES_AT_ROOT
wxTR_HIDE_ROOT = controls2c.wxTR_HIDE_ROOT
wxTR_ROW_LINES = controls2c.wxTR_ROW_LINES
wxTR_HAS_VARIABLE_ROW_HEIGHT = controls2c.wxTR_HAS_VARIABLE_ROW_HEIGHT
wxTR_FULL_ROW_HIGHLIGHT = controls2c.wxTR_FULL_ROW_HIGHLIGHT
wxTR_DEFAULT_STYLE = controls2c.wxTR_DEFAULT_STYLE
wxTR_TWIST_BUTTONS = controls2c.wxTR_TWIST_BUTTONS
wxTR_MAC_BUTTONS = controls2c.wxTR_MAC_BUTTONS
wxTR_AQUA_BUTTONS = controls2c.wxTR_AQUA_BUTTONS
wxTreeItemIcon_Normal = controls2c.wxTreeItemIcon_Normal
wxTreeItemIcon_Selected = controls2c.wxTreeItemIcon_Selected
wxTreeItemIcon_Expanded = controls2c.wxTreeItemIcon_Expanded
@@ -1496,6 +1534,7 @@ wxEVT_COMMAND_TREE_ITEM_ACTIVATED = controls2c.wxEVT_COMMAND_TREE_ITEM_ACTIVATED
wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK
wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK = controls2c.wxEVT_COMMAND_TREE_ITEM_MIDDLE_CLICK
wxEVT_COMMAND_TREE_END_DRAG = controls2c.wxEVT_COMMAND_TREE_END_DRAG
wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK = controls2c.wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK
wxDIRCTRL_DIR_ONLY = controls2c.wxDIRCTRL_DIR_ONLY
wxDIRCTRL_SELECT_FIRST = controls2c.wxDIRCTRL_SELECT_FIRST
wxDIRCTRL_SHOW_FILTERS = controls2c.wxDIRCTRL_SHOW_FILTERS
wxPython/src/gtk/events.cpp
+660 -42
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/events.py
+96 -3
View File
@@ -25,9 +25,6 @@ class wxEventPtr(wxObjectPtr):
def GetId(self, *_args, **_kwargs):
val = eventsc.wxEvent_GetId(self, *_args, **_kwargs)
return val
def GetSkipped(self, *_args, **_kwargs):
val = eventsc.wxEvent_GetSkipped(self, *_args, **_kwargs)
return val
def GetTimestamp(self, *_args, **_kwargs):
val = eventsc.wxEvent_GetTimestamp(self, *_args, **_kwargs)
return val
@@ -43,9 +40,24 @@ class wxEventPtr(wxObjectPtr):
def SetTimestamp(self, *_args, **_kwargs):
val = eventsc.wxEvent_SetTimestamp(self, *_args, **_kwargs)
return val
def IsCommandEvent(self, *_args, **_kwargs):
val = eventsc.wxEvent_IsCommandEvent(self, *_args, **_kwargs)
return val
def Skip(self, *_args, **_kwargs):
val = eventsc.wxEvent_Skip(self, *_args, **_kwargs)
return val
def GetSkipped(self, *_args, **_kwargs):
val = eventsc.wxEvent_GetSkipped(self, *_args, **_kwargs)
return val
def ShouldPropagate(self, *_args, **_kwargs):
val = eventsc.wxEvent_ShouldPropagate(self, *_args, **_kwargs)
return val
def StopPropagation(self, *_args, **_kwargs):
val = eventsc.wxEvent_StopPropagation(self, *_args, **_kwargs)
return val
def ResumePropagation(self, *_args, **_kwargs):
val = eventsc.wxEvent_ResumePropagation(self, *_args, **_kwargs)
return val
def Clone(self, *_args, **_kwargs):
val = eventsc.wxEvent_Clone(self, *_args, **_kwargs)
if val: val = wxEventPtr(val)
@@ -59,6 +71,46 @@ class wxEvent(wxEventPtr):
class wxPropagationDisablerPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self, delfunc=eventsc.delete_wxPropagationDisabler):
if self.thisown == 1:
try:
delfunc(self)
except:
pass
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxPropagationDisabler instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxPropagationDisabler(wxPropagationDisablerPtr):
def __init__(self,*_args,**_kwargs):
self.this = eventsc.new_wxPropagationDisabler(*_args,**_kwargs)
self.thisown = 1
class wxPropagateOncePtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self, delfunc=eventsc.delete_wxPropagateOnce):
if self.thisown == 1:
try:
delfunc(self)
except:
pass
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxPropagateOnce instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxPropagateOnce(wxPropagateOncePtr):
def __init__(self,*_args,**_kwargs):
self.this = eventsc.new_wxPropagateOnce(*_args,**_kwargs)
self.thisown = 1
class wxSizeEventPtr(wxEventPtr):
def __init__(self,this):
self.this = this
@@ -67,6 +119,13 @@ class wxSizeEventPtr(wxEventPtr):
val = eventsc.wxSizeEvent_GetSize(self, *_args, **_kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def GetRect(self, *_args, **_kwargs):
val = eventsc.wxSizeEvent_GetRect(self, *_args, **_kwargs)
if val: val = wxRectPtr(val) ; val.thisown = 1
return val
def SetRect(self, *_args, **_kwargs):
val = eventsc.wxSizeEvent_SetRect(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxSizeEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxSizeEvent(wxSizeEventPtr):
@@ -585,6 +644,13 @@ class wxMoveEventPtr(wxEventPtr):
val = eventsc.wxMoveEvent_GetPosition(self, *_args, **_kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def GetRect(self, *_args, **_kwargs):
val = eventsc.wxMoveEvent_GetRect(self, *_args, **_kwargs)
if val: val = wxRectPtr(val) ; val.thisown = 1
return val
def SetRect(self, *_args, **_kwargs):
val = eventsc.wxMoveEvent_SetRect(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxMoveEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxMoveEvent(wxMoveEventPtr):
@@ -698,6 +764,9 @@ class wxMenuEventPtr(wxEventPtr):
def IsPopup(self, *_args, **_kwargs):
val = eventsc.wxMenuEvent_IsPopup(self, *_args, **_kwargs)
return val
def GetMenu(self, *_args, **_kwargs):
val = eventsc.wxMenuEvent_GetMenu(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxMenuEvent instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxMenuEvent(wxMenuEventPtr):
@@ -1152,7 +1221,31 @@ class wxPyCommandEvent(wxPyCommandEventPtr):
wxNewEventType = eventsc.wxNewEventType
wxIdleEvent_SetMode = eventsc.wxIdleEvent_SetMode
wxIdleEvent_GetMode = eventsc.wxIdleEvent_GetMode
wxIdleEvent_CanSend = eventsc.wxIdleEvent_CanSend
wxUpdateUIEvent_SetUpdateInterval = eventsc.wxUpdateUIEvent_SetUpdateInterval
wxUpdateUIEvent_GetUpdateInterval = eventsc.wxUpdateUIEvent_GetUpdateInterval
wxUpdateUIEvent_CanUpdate = eventsc.wxUpdateUIEvent_CanUpdate
wxUpdateUIEvent_ResetUpdateTime = eventsc.wxUpdateUIEvent_ResetUpdateTime
wxUpdateUIEvent_SetMode = eventsc.wxUpdateUIEvent_SetMode
wxUpdateUIEvent_GetMode = eventsc.wxUpdateUIEvent_GetMode
#-------------- VARIABLE WRAPPERS ------------------
wxEVENT_PROPAGATE_NONE = eventsc.wxEVENT_PROPAGATE_NONE
wxEVENT_PROPAGATE_MAX = eventsc.wxEVENT_PROPAGATE_MAX
wxIDLE_PROCESS_ALL = eventsc.wxIDLE_PROCESS_ALL
wxIDLE_PROCESS_SPECIFIED = eventsc.wxIDLE_PROCESS_SPECIFIED
wxUPDATE_UI_PROCESS_ALL = eventsc.wxUPDATE_UI_PROCESS_ALL
wxUPDATE_UI_PROCESS_SPECIFIED = eventsc.wxUPDATE_UI_PROCESS_SPECIFIED
wxPython/src/gtk/fonts.cpp
+264 -205
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/fonts.py
+18 -12
View File
@@ -86,27 +86,27 @@ class wxFontMapperPtr :
delfunc(self)
except:
pass
def GetAltForEncoding(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_GetAltForEncoding(self, *_args, **_kwargs)
return val
def IsEncodingAvailable(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_IsEncodingAvailable(self, *_args, **_kwargs)
return val
def CharsetToEncoding(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_CharsetToEncoding(self, *_args, **_kwargs)
return val
def SetDialogParent(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_SetDialogParent(self, *_args, **_kwargs)
return val
def SetDialogTitle(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_SetDialogTitle(self, *_args, **_kwargs)
return val
def SetConfig(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_SetConfig(self, *_args, **_kwargs)
return val
def SetConfigPath(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_SetConfigPath(self, *_args, **_kwargs)
return val
def GetAltForEncoding(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_GetAltForEncoding(self, *_args, **_kwargs)
return val
def IsEncodingAvailable(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_IsEncodingAvailable(self, *_args, **_kwargs)
return val
def SetDialogParent(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_SetDialogParent(self, *_args, **_kwargs)
return val
def SetDialogTitle(self, *_args, **_kwargs):
val = fontsc.wxFontMapper_SetDialogTitle(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxFontMapper instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxFontMapper(wxFontMapperPtr):
@@ -429,6 +429,10 @@ def wxFontMapper_Set(*_args, **_kwargs):
if val: val = wxFontMapperPtr(val)
return val
wxFontMapper_GetSupportedEncodingsCount = fontsc.wxFontMapper_GetSupportedEncodingsCount
wxFontMapper_GetEncoding = fontsc.wxFontMapper_GetEncoding
wxFontMapper_GetEncodingName = fontsc.wxFontMapper_GetEncodingName
wxFontMapper_GetEncodingDescription = fontsc.wxFontMapper_GetEncodingDescription
@@ -452,6 +456,8 @@ def wxLocale_GetLanguageInfo(*_args, **_kwargs):
if val: val = wxLanguageInfoPtr(val)
return val
wxLocale_GetLanguageName = fontsc.wxLocale_GetLanguageName
def wxLocale_FindLanguageInfo(*_args, **_kwargs):
val = fontsc.wxLocale_FindLanguageInfo(*_args,**_kwargs)
if val: val = wxLanguageInfoPtr(val)
wxPython/src/gtk/frames.cpp
+69 -1
View File
@@ -1431,7 +1431,7 @@ static PyObject *_wrap_wxFrame_CreateToolBar(PyObject *self, PyObject *args, PyO
PyObject * _resultobj;
wxToolBar * _result;
wxFrame * _arg0;
long _arg1 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
long _arg1 = (long ) -1;
wxWindowID _arg2 = (wxWindowID ) -1;
wxString * _arg3 = (wxString *) &wxPyToolBarNameStr;
PyObject * _argo0 = 0;
@@ -1561,6 +1561,72 @@ static PyObject *_wrap_wxFrame_SendSizeEvent(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxFrame_DoMenuUpdates(_swigobj,_swigarg0) (_swigobj->DoMenuUpdates(_swigarg0))
static PyObject *_wrap_wxFrame_DoMenuUpdates(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxFrame * _arg0;
wxMenu * _arg1 = (wxMenu *) NULL;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
char *_kwnames[] = { "self","menu", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|O:wxFrame_DoMenuUpdates",_kwnames,&_argo0,&_argo1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_DoMenuUpdates. Expected _wxFrame_p.");
return NULL;
}
}
if (_argo1) {
if (_argo1 == Py_None) { _arg1 = NULL; }
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxMenu_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxFrame_DoMenuUpdates. Expected _wxMenu_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_DoMenuUpdates(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxFrame_UpdateWindowUI(_swigobj,_swigarg0) (_swigobj->UpdateWindowUI(_swigarg0))
static PyObject *_wrap_wxFrame_UpdateWindowUI(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxFrame * _arg0;
long _arg1 = (long ) wxUPDATE_UI_NONE;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","flags", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|l:wxFrame_UpdateWindowUI",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxFrame_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxFrame_UpdateWindowUI. Expected _wxFrame_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxFrame_UpdateWindowUI(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static void *SwigwxDialogTowxTopLevelWindow(void *ptr) {
wxDialog *src;
wxTopLevelWindow *dest;
@@ -2649,6 +2715,8 @@ static PyMethodDef framescMethods[] = {
{ "wxDialog_Create", (PyCFunction) _wrap_wxDialog_Create, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPreDialog", (PyCFunction) _wrap_new_wxPreDialog, METH_VARARGS | METH_KEYWORDS },
{ "new_wxDialog", (PyCFunction) _wrap_new_wxDialog, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_UpdateWindowUI", (PyCFunction) _wrap_wxFrame_UpdateWindowUI, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_DoMenuUpdates", (PyCFunction) _wrap_wxFrame_DoMenuUpdates, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_SendSizeEvent", (PyCFunction) _wrap_wxFrame_SendSizeEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_SetToolBar", (PyCFunction) _wrap_wxFrame_SetToolBar, METH_VARARGS | METH_KEYWORDS },
{ "wxFrame_GetToolBar", (PyCFunction) _wrap_wxFrame_GetToolBar, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/frames.py
+6
View File
@@ -143,6 +143,12 @@ class wxFramePtr(wxTopLevelWindowPtr):
def SendSizeEvent(self, *_args, **_kwargs):
val = framesc.wxFrame_SendSizeEvent(self, *_args, **_kwargs)
return val
def DoMenuUpdates(self, *_args, **_kwargs):
val = framesc.wxFrame_DoMenuUpdates(self, *_args, **_kwargs)
return val
def UpdateWindowUI(self, *_args, **_kwargs):
val = framesc.wxFrame_UpdateWindowUI(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxFrame instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
Command = ProcessCommand
wxPython/src/gtk/gdi.cpp
+348
View File
@@ -61,6 +61,7 @@ extern PyObject *SWIG_newvarlink(void);
#include <wx/fontmap.h>
#include <wx/fontutil.h>
#include <wx/dcbuffer.h>
#include <wx/dcmirror.h>
#include <wx/iconbndl.h>
@@ -180,6 +181,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
return icon;
}
wxIcon* wxIconFromLocation(const wxIconLocation& loc) {
wxIcon* icon = new wxIcon(loc);
return icon;
}
wxCursor* wxPyStockCursor(int id) {
return new wxCursor(id);
}
@@ -544,6 +550,39 @@ static PyObject *_wrap_wxIconFromBitmap(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
static PyObject *_wrap_wxIconFromLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxIcon * _result;
wxIconLocation * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "loc", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconFromLocation",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconFromLocation. Expected _wxIconLocation_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxIcon *)wxIconFromLocation(*_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxIcon_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static PyObject *_wrap_wxStockCursor(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxCursor * _result;
@@ -2532,6 +2571,251 @@ static PyObject *_wrap_wxIcon_CopyFromBitmap(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static wxIconLocation *new_wxIconLocation(const wxString *filename,int num) {
#ifdef __WXMSW__
return new wxIconLocation(*filename, num);
#else
return new wxIconLocation(*filename);
#endif
}
static PyObject *_wrap_new_wxIconLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxIconLocation * _result;
wxString * _arg0 = (wxString *) &wxPyEmptyString;
int _arg1 = (int ) 0;
PyObject * _obj0 = 0;
char *_kwnames[] = { "filename","num", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|Oi:new_wxIconLocation",_kwnames,&_obj0,&_arg1))
return NULL;
if (_obj0)
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxIconLocation *)new_wxIconLocation(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxIconLocation_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
{
if (_obj0)
delete _arg0;
}
return _resultobj;
}
#define delete_wxIconLocation(_swigobj) (delete _swigobj)
static PyObject *_wrap_delete_wxIconLocation(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxIconLocation * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:delete_wxIconLocation",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxIconLocation. Expected _wxIconLocation_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete_wxIconLocation(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxIconLocation_IsOk(_swigobj) (_swigobj->IsOk())
static PyObject *_wrap_wxIconLocation_IsOk(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxIconLocation * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconLocation_IsOk",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_IsOk. Expected _wxIconLocation_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxIconLocation_IsOk(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxIconLocation_SetFileName(_swigobj,_swigarg0) (_swigobj->SetFileName(_swigarg0))
static PyObject *_wrap_wxIconLocation_SetFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxIconLocation * _arg0;
wxString * _arg1;
PyObject * _argo0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","filename", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxIconLocation_SetFileName",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_SetFileName. Expected _wxIconLocation_p.");
return NULL;
}
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxIconLocation_SetFileName(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
#define wxIconLocation_GetFileName(_swigobj) (_swigobj->GetFileName())
static PyObject *_wrap_wxIconLocation_GetFileName(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxIconLocation * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconLocation_GetFileName",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_GetFileName. Expected _wxIconLocation_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
const wxString & _result_ref = wxIconLocation_GetFileName(_arg0);
_result = (wxString *) &_result_ref;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
return _resultobj;
}
static void wxIconLocation_SetIndex(wxIconLocation *self,int num) {
#ifdef __WXMSW__
self->SetIndex(num);
#else
// do nothing
#endif
}
static PyObject *_wrap_wxIconLocation_SetIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxIconLocation * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","num", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxIconLocation_SetIndex",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_SetIndex. Expected _wxIconLocation_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxIconLocation_SetIndex(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static int wxIconLocation_GetIndex(wxIconLocation *self) {
#ifdef __WXMSW__
return self->GetIndex();
#else
return -1;
#endif
}
static PyObject *_wrap_wxIconLocation_GetIndex(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxIconLocation * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxIconLocation_GetIndex",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxIconLocation_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxIconLocation_GetIndex. Expected _wxIconLocation_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxIconLocation_GetIndex(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define new_wxIconBundle() (new wxIconBundle())
static PyObject *_wrap_new_wxIconBundle(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -8858,6 +9142,59 @@ static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args, PyObject *
return _resultobj;
}
static void *SwigwxMirrorDCTowxDC(void *ptr) {
wxMirrorDC *src;
wxDC *dest;
src = (wxMirrorDC *) ptr;
dest = (wxDC *) src;
return (void *) dest;
}
static void *SwigwxMirrorDCTowxObject(void *ptr) {
wxMirrorDC *src;
wxObject *dest;
src = (wxMirrorDC *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxMirrorDC(_swigarg0,_swigarg1) (new wxMirrorDC(_swigarg0,_swigarg1))
static PyObject *_wrap_new_wxMirrorDC(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMirrorDC * _result;
wxDC * _arg0;
bool _arg1;
PyObject * _argo0 = 0;
int tempbool1;
char *_kwnames[] = { "dc","mirror", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:new_wxMirrorDC",_kwnames,&_argo0,&tempbool1))
return NULL;
if (_argo0) {
if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxDC_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxMirrorDC. Expected _wxDC_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMirrorDC *)new_wxMirrorDC(*_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxMirrorDC_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static void *SwigwxPaletteTowxGDIObject(void *ptr) {
wxPalette *src;
wxGDIObject *dest;
@@ -10806,6 +11143,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxPalette_GetPixel", (PyCFunction) _wrap_wxPalette_GetPixel, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxPalette", (PyCFunction) _wrap_delete_wxPalette, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPalette", (PyCFunction) _wrap_new_wxPalette, METH_VARARGS | METH_KEYWORDS },
{ "new_wxMirrorDC", (PyCFunction) _wrap_new_wxMirrorDC, METH_VARARGS | METH_KEYWORDS },
{ "new_wxWindowDC", (PyCFunction) _wrap_new_wxWindowDC, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPaintDC", (PyCFunction) _wrap_new_wxPaintDC, METH_VARARGS | METH_KEYWORDS },
{ "new_wxClientDC", (PyCFunction) _wrap_new_wxClientDC, METH_VARARGS | METH_KEYWORDS },
@@ -10977,6 +11315,13 @@ static PyMethodDef gdicMethods[] = {
{ "new_wxIconBundleFromIcon", (PyCFunction) _wrap_new_wxIconBundleFromIcon, METH_VARARGS | METH_KEYWORDS },
{ "new_wxIconBundleFromFile", (PyCFunction) _wrap_new_wxIconBundleFromFile, METH_VARARGS | METH_KEYWORDS },
{ "new_wxIconBundle", (PyCFunction) _wrap_new_wxIconBundle, METH_VARARGS | METH_KEYWORDS },
{ "wxIconLocation_GetIndex", (PyCFunction) _wrap_wxIconLocation_GetIndex, METH_VARARGS | METH_KEYWORDS },
{ "wxIconLocation_SetIndex", (PyCFunction) _wrap_wxIconLocation_SetIndex, METH_VARARGS | METH_KEYWORDS },
{ "wxIconLocation_GetFileName", (PyCFunction) _wrap_wxIconLocation_GetFileName, METH_VARARGS | METH_KEYWORDS },
{ "wxIconLocation_SetFileName", (PyCFunction) _wrap_wxIconLocation_SetFileName, METH_VARARGS | METH_KEYWORDS },
{ "wxIconLocation_IsOk", (PyCFunction) _wrap_wxIconLocation_IsOk, METH_VARARGS | METH_KEYWORDS },
{ "delete_wxIconLocation", (PyCFunction) _wrap_delete_wxIconLocation, METH_VARARGS | METH_KEYWORDS },
{ "new_wxIconLocation", (PyCFunction) _wrap_new_wxIconLocation, METH_VARARGS | METH_KEYWORDS },
{ "wxIcon_CopyFromBitmap", (PyCFunction) _wrap_wxIcon_CopyFromBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxIcon_SetDepth", (PyCFunction) _wrap_wxIcon_SetDepth, METH_VARARGS | METH_KEYWORDS },
{ "wxIcon_SetHeight", (PyCFunction) _wrap_wxIcon_SetHeight, METH_VARARGS | METH_KEYWORDS },
@@ -11016,6 +11361,7 @@ static PyMethodDef gdicMethods[] = {
{ "wxCursorFromBits", (PyCFunction) _wrap_wxCursorFromBits, METH_VARARGS | METH_KEYWORDS },
{ "wxCursorFromImage", (PyCFunction) _wrap_wxCursorFromImage, METH_VARARGS | METH_KEYWORDS },
{ "wxStockCursor", (PyCFunction) _wrap_wxStockCursor, METH_VARARGS | METH_KEYWORDS },
{ "wxIconFromLocation", (PyCFunction) _wrap_wxIconFromLocation, METH_VARARGS | METH_KEYWORDS },
{ "wxIconFromBitmap", (PyCFunction) _wrap_wxIconFromBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxIconFromXPMData", (PyCFunction) _wrap_wxIconFromXPMData, METH_VARARGS | METH_KEYWORDS },
{ "wxEmptyIcon", (PyCFunction) _wrap_wxEmptyIcon, METH_VARARGS | METH_KEYWORDS },
@@ -11055,6 +11401,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxGDIObject","_wxCursor",SwigwxCursorTowxGDIObject},
{ "_wxGDIObject","_wxIcon",SwigwxIconTowxGDIObject},
{ "_wxGDIObject","_wxBitmap",SwigwxBitmapTowxGDIObject},
{ "_wxDC","_wxMirrorDC",SwigwxMirrorDCTowxDC},
{ "_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC},
{ "_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC},
{ "_wxDC","_wxClientDC",SwigwxClientDCTowxDC},
@@ -11101,6 +11448,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxRegion",SwigwxRegionTowxObject},
{ "_wxObject","_wxImageList",SwigwxImageListTowxObject},
{ "_wxObject","_wxPalette",SwigwxPaletteTowxObject},
{ "_wxObject","_wxMirrorDC",SwigwxMirrorDCTowxObject},
{ "_wxObject","_wxWindowDC",SwigwxWindowDCTowxObject},
{ "_wxObject","_wxPaintDC",SwigwxPaintDCTowxObject},
{ "_wxObject","_wxClientDC",SwigwxClientDCTowxObject},
wxPython/src/gtk/gdi.py
+54
View File
@@ -170,6 +170,41 @@ class wxIcon(wxIconPtr):
class wxIconLocationPtr :
def __init__(self,this):
self.this = this
self.thisown = 0
def __del__(self, delfunc=gdic.delete_wxIconLocation):
if self.thisown == 1:
try:
delfunc(self)
except:
pass
def IsOk(self, *_args, **_kwargs):
val = gdic.wxIconLocation_IsOk(self, *_args, **_kwargs)
return val
def SetFileName(self, *_args, **_kwargs):
val = gdic.wxIconLocation_SetFileName(self, *_args, **_kwargs)
return val
def GetFileName(self, *_args, **_kwargs):
val = gdic.wxIconLocation_GetFileName(self, *_args, **_kwargs)
return val
def SetIndex(self, *_args, **_kwargs):
val = gdic.wxIconLocation_SetIndex(self, *_args, **_kwargs)
return val
def GetIndex(self, *_args, **_kwargs):
val = gdic.wxIconLocation_GetIndex(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxIconLocation instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxIconLocation(wxIconLocationPtr):
def __init__(self,*_args,**_kwargs):
self.this = gdic.new_wxIconLocation(*_args,**_kwargs)
self.thisown = 1
class wxIconBundlePtr :
def __init__(self,this):
self.this = this
@@ -1034,6 +1069,20 @@ class wxWindowDC(wxWindowDCPtr):
class wxMirrorDCPtr(wxDCPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxMirrorDC instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxMirrorDC(wxMirrorDCPtr):
def __init__(self,*_args,**_kwargs):
self.this = gdic.new_wxMirrorDC(*_args,**_kwargs)
self.thisown = 1
class wxPalettePtr(wxGDIObjectPtr):
def __init__(self,this):
self.this = this
@@ -1304,6 +1353,11 @@ def wxIconFromBitmap(*_args, **_kwargs):
if val: val = wxIconPtr(val); val.thisown = 1
return val
def wxIconFromLocation(*_args, **_kwargs):
val = gdic.wxIconFromLocation(*_args,**_kwargs)
if val: val = wxIconPtr(val); val.thisown = 1
return val
def wxStockCursor(*_args, **_kwargs):
val = gdic.wxStockCursor(*_args,**_kwargs)
if val: val = wxCursorPtr(val); val.thisown = 1
wxPython/src/gtk/grid.cpp
+32 -3
View File
@@ -3855,13 +3855,13 @@ static PyObject *_wrap_wxGridCellAttr_SetSize(PyObject *self, PyObject *args, Py
static PyObject *_wrap_wxGridCellAttr_SetOverflow(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxGridCellAttr * _arg0;
bool _arg1;
bool _arg1 = (bool ) TRUE;
PyObject * _argo0 = 0;
int tempbool1;
int tempbool1 = (int) TRUE;
char *_kwnames[] = { "self","allow", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxGridCellAttr_SetOverflow",_kwnames,&_argo0,&tempbool1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxGridCellAttr_SetOverflow",_kwnames,&_argo0,&tempbool1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -4212,6 +4212,34 @@ static PyObject *_wrap_wxGridCellAttr_HasReadWriteMode(PyObject *self, PyObject
return _resultobj;
}
#define wxGridCellAttr_HasOverflowMode(_swigobj) (_swigobj->HasOverflowMode())
static PyObject *_wrap_wxGridCellAttr_HasOverflowMode(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxGridCellAttr * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxGridCellAttr_HasOverflowMode",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxGridCellAttr_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridCellAttr_HasOverflowMode. Expected _wxGridCellAttr_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxGridCellAttr_HasOverflowMode(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxGridCellAttr_GetTextColour(_swigobj) (_swigobj->GetTextColour())
static PyObject *_wrap_wxGridCellAttr_GetTextColour(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -15391,6 +15419,7 @@ static PyMethodDef gridcMethods[] = {
{ "wxGridCellAttr_GetFont", (PyCFunction) _wrap_wxGridCellAttr_GetFont, METH_VARARGS | METH_KEYWORDS },
{ "wxGridCellAttr_GetBackgroundColour", (PyCFunction) _wrap_wxGridCellAttr_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
{ "wxGridCellAttr_GetTextColour", (PyCFunction) _wrap_wxGridCellAttr_GetTextColour, METH_VARARGS | METH_KEYWORDS },
{ "wxGridCellAttr_HasOverflowMode", (PyCFunction) _wrap_wxGridCellAttr_HasOverflowMode, METH_VARARGS | METH_KEYWORDS },
{ "wxGridCellAttr_HasReadWriteMode", (PyCFunction) _wrap_wxGridCellAttr_HasReadWriteMode, METH_VARARGS | METH_KEYWORDS },
{ "wxGridCellAttr_HasEditor", (PyCFunction) _wrap_wxGridCellAttr_HasEditor, METH_VARARGS | METH_KEYWORDS },
{ "wxGridCellAttr_HasRenderer", (PyCFunction) _wrap_wxGridCellAttr_HasRenderer, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/grid.py
+3
View File
@@ -566,6 +566,9 @@ class wxGridCellAttrPtr :
def HasReadWriteMode(self, *_args, **_kwargs):
val = gridc.wxGridCellAttr_HasReadWriteMode(self, *_args, **_kwargs)
return val
def HasOverflowMode(self, *_args, **_kwargs):
val = gridc.wxGridCellAttr_HasOverflowMode(self, *_args, **_kwargs)
return val
def GetTextColour(self, *_args, **_kwargs):
val = gridc.wxGridCellAttr_GetTextColour(self, *_args, **_kwargs)
if val: val = wxColourPtr(val) ; val.thisown = 1
wxPython/src/gtk/html.cpp
+494 -10
View File
File diff suppressed because it is too large Load Diff
wxPython/src/gtk/html.py
+51
View File
@@ -537,6 +537,17 @@ class wxHtmlCellPtr(wxObjectPtr):
val = htmlc.wxHtmlCell_GetParent(self, *_args, **_kwargs)
if val: val = wxHtmlContainerCellPtr(val)
return val
def GetFirstChild(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_GetFirstChild(self, *_args, **_kwargs)
if val: val = wxHtmlCellPtr(val)
return val
def GetCursor(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_GetCursor(self, *_args, **_kwargs)
if val: val = wxCursorPtr(val) ; val.thisown = 1
return val
def IsFormattingCell(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_IsFormattingCell(self, *_args, **_kwargs)
return val
def SetLink(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_SetLink(self, *_args, **_kwargs)
return val
@@ -568,6 +579,37 @@ class wxHtmlCellPtr(wxObjectPtr):
def SetCanLiveOnPagebreak(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_SetCanLiveOnPagebreak(self, *_args, **_kwargs)
return val
def IsLinebreakAllowed(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_IsLinebreakAllowed(self, *_args, **_kwargs)
return val
def IsTerminalCell(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_IsTerminalCell(self, *_args, **_kwargs)
return val
def FindCellByPos(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_FindCellByPos(self, *_args, **_kwargs)
if val: val = wxHtmlCellPtr(val)
return val
def GetAbsPos(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_GetAbsPos(self, *_args, **_kwargs)
if val: val = wxPointPtr(val) ; val.thisown = 1
return val
def GetFirstTerminal(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_GetFirstTerminal(self, *_args, **_kwargs)
if val: val = wxHtmlCellPtr(val)
return val
def GetLastTerminal(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_GetLastTerminal(self, *_args, **_kwargs)
if val: val = wxHtmlCellPtr(val)
return val
def GetDepth(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_GetDepth(self, *_args, **_kwargs)
return val
def IsBefore(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_IsBefore(self, *_args, **_kwargs)
return val
def ConvertToText(self, *_args, **_kwargs):
val = htmlc.wxHtmlCell_ConvertToText(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxHtmlCell instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxHtmlCell(wxHtmlCellPtr):
@@ -964,6 +1006,10 @@ wxHtmlWinParser_AddTagHandler = htmlc.wxHtmlWinParser_AddTagHandler
wxHtmlWindow_AddFilter = htmlc.wxHtmlWindow_AddFilter
wxHtmlPrintout_AddFilter = htmlc.wxHtmlPrintout_AddFilter
wxHtmlPrintout_CleanUpStatics = htmlc.wxHtmlPrintout_CleanUpStatics
#-------------- VARIABLE WRAPPERS ------------------
@@ -989,6 +1035,8 @@ wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP
wxHTML_COND_USER = htmlc.wxHTML_COND_USER
wxHW_SCROLLBAR_NEVER = htmlc.wxHW_SCROLLBAR_NEVER
wxHW_SCROLLBAR_AUTO = htmlc.wxHW_SCROLLBAR_AUTO
wxHW_NO_SELECTION = htmlc.wxHW_NO_SELECTION
wxHW_DEFAULT_STYLE = htmlc.wxHW_DEFAULT_STYLE
wxHTML_OPEN = htmlc.wxHTML_OPEN
wxHTML_BLOCK = htmlc.wxHTML_BLOCK
wxHTML_REDIRECT = htmlc.wxHTML_REDIRECT
@@ -998,6 +1046,9 @@ wxHTML_URL_OTHER = htmlc.wxHTML_URL_OTHER
wxHTML_SEL_OUT = htmlc.wxHTML_SEL_OUT
wxHTML_SEL_IN = htmlc.wxHTML_SEL_IN
wxHTML_SEL_CHANGING = htmlc.wxHTML_SEL_CHANGING
wxHTML_FIND_EXACT = htmlc.wxHTML_FIND_EXACT
wxHTML_FIND_NEAREST_BEFORE = htmlc.wxHTML_FIND_NEAREST_BEFORE
wxHTML_FIND_NEAREST_AFTER = htmlc.wxHTML_FIND_NEAREST_AFTER
wxPAGE_ODD = htmlc.wxPAGE_ODD
wxPAGE_EVEN = htmlc.wxPAGE_EVEN
wxPAGE_ALL = htmlc.wxPAGE_ALL
wxPython/src/gtk/image.cpp
+38 -7
View File
@@ -85,11 +85,11 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
return target;
}
wxImage* wxEmptyImage(int width=0, int height=0) {
if (width == 0 && height == 0)
return new wxImage;
wxImage* wxEmptyImage(int width=0, int height=0, bool clear = TRUE) {
if (width > 0 && height > 0)
return new wxImage(width, height, clear);
else
return new wxImage(width, height);
return new wxImage;
}
@@ -143,15 +143,18 @@ static PyObject *_wrap_wxEmptyImage(PyObject *self, PyObject *args, PyObject *kw
wxImage * _result;
int _arg0 = (int ) 0;
int _arg1 = (int ) 0;
char *_kwnames[] = { "width","height", NULL };
bool _arg2 = (bool ) TRUE;
int tempbool2 = (int) TRUE;
char *_kwnames[] = { "width","height","clear", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|ii:wxEmptyImage",_kwnames,&_arg0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|iii:wxEmptyImage",_kwnames,&_arg0,&_arg1,&tempbool2))
return NULL;
_arg2 = (bool ) tempbool2;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxImage *)wxEmptyImage(_arg0,_arg1);
_result = (wxImage *)wxEmptyImage(_arg0,_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@@ -3536,6 +3539,33 @@ static PyObject *_wrap_wxImage_RemoveHandler(PyObject *self, PyObject *args, PyO
return _resultobj;
}
static PyObject *_wrap_wxImage_GetImageExtWildcard(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
char *_kwnames[] = { NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":wxImage_GetImageExtWildcard",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxImage::GetImageExtWildcard());
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
delete _result;
}
return _resultobj;
}
static wxBitmap wxImage_ConvertToBitmap(wxImage *self) {
wxBitmap bitmap(*self);
return bitmap;
@@ -3609,6 +3639,7 @@ static PyObject *_wrap_wxImage_ConvertToMonoBitmap(PyObject *self, PyObject *arg
static PyMethodDef imagecMethods[] = {
{ "wxImage_ConvertToMonoBitmap", (PyCFunction) _wrap_wxImage_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS },
{ "wxImage_GetImageExtWildcard", (PyCFunction) _wrap_wxImage_GetImageExtWildcard, METH_VARARGS | METH_KEYWORDS },
{ "wxImage_RemoveHandler", (PyCFunction) _wrap_wxImage_RemoveHandler, METH_VARARGS | METH_KEYWORDS },
{ "wxImage_InsertHandler", (PyCFunction) _wrap_wxImage_InsertHandler, METH_VARARGS | METH_KEYWORDS },
{ "wxImage_AddHandler", (PyCFunction) _wrap_wxImage_AddHandler, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/image.py
+2
View File
@@ -454,6 +454,8 @@ wxImage_InsertHandler = imagec.wxImage_InsertHandler
wxImage_RemoveHandler = imagec.wxImage_RemoveHandler
wxImage_GetImageExtWildcard = imagec.wxImage_GetImageExtWildcard
#-------------- VARIABLE WRAPPERS ------------------
wxPython/src/gtk/misc.cpp
+72
View File
@@ -1313,6 +1313,76 @@ static PyObject *_wrap_wxSize_SetHeight(PyObject *self, PyObject *args, PyObject
return _resultobj;
}
#define wxSize_IncTo(_swigobj,_swigarg0) (_swigobj->IncTo(_swigarg0))
static PyObject *_wrap_wxSize_IncTo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSize * _arg0;
wxSize * _arg1;
wxSize temp;
PyObject * _obj0 = 0;
wxSize temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","sz", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSize_IncTo",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxSize_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxSize_helper(_obj1, &_arg1))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSize_IncTo(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxSize_DecTo(_swigobj,_swigarg0) (_swigobj->DecTo(_swigarg0))
static PyObject *_wrap_wxSize_DecTo(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSize * _arg0;
wxSize * _arg1;
wxSize temp;
PyObject * _obj0 = 0;
wxSize temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","sz", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSize_DecTo",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = &temp;
if (! wxSize_helper(_obj0, &_arg0))
return NULL;
}
{
_arg1 = &temp0;
if (! wxSize_helper(_obj1, &_arg1))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSize_DecTo(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
static PyObject * wxSize_asTuple(wxSize *self) {
wxPyBeginBlockThreads();
PyObject* tup = PyTuple_New(2);
@@ -5494,6 +5564,8 @@ static PyMethodDef misccMethods[] = {
{ "wxSize___ne__", (PyCFunction) _wrap_wxSize___ne__, METH_VARARGS | METH_KEYWORDS },
{ "wxSize___eq__", (PyCFunction) _wrap_wxSize___eq__, METH_VARARGS | METH_KEYWORDS },
{ "wxSize_asTuple", (PyCFunction) _wrap_wxSize_asTuple, METH_VARARGS | METH_KEYWORDS },
{ "wxSize_DecTo", (PyCFunction) _wrap_wxSize_DecTo, METH_VARARGS | METH_KEYWORDS },
{ "wxSize_IncTo", (PyCFunction) _wrap_wxSize_IncTo, METH_VARARGS | METH_KEYWORDS },
{ "wxSize_SetHeight", (PyCFunction) _wrap_wxSize_SetHeight, METH_VARARGS | METH_KEYWORDS },
{ "wxSize_SetWidth", (PyCFunction) _wrap_wxSize_SetWidth, METH_VARARGS | METH_KEYWORDS },
{ "wxSize_GetHeight", (PyCFunction) _wrap_wxSize_GetHeight, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/misc.py
+6
View File
@@ -50,6 +50,12 @@ class wxSizePtr :
def SetHeight(self, *_args, **_kwargs):
val = miscc.wxSize_SetHeight(self, *_args, **_kwargs)
return val
def IncTo(self, *_args, **_kwargs):
val = miscc.wxSize_IncTo(self, *_args, **_kwargs)
return val
def DecTo(self, *_args, **_kwargs):
val = miscc.wxSize_DecTo(self, *_args, **_kwargs)
return val
def asTuple(self, *_args, **_kwargs):
val = miscc.wxSize_asTuple(self, *_args, **_kwargs)
return val
wxPython/src/gtk/misc2.cpp
+208
View File
@@ -72,6 +72,7 @@ extern PyObject *SWIG_newvarlink(void);
#include <wx/mimetype.h>
#include <wx/snglinst.h>
#include <wx/effects.h>
#include <wx/sysopt.h>
static PyObject* t_output_helper(PyObject* target, PyObject* o) {
@@ -2400,6 +2401,206 @@ static PyObject *_wrap_wxSystemSettings_SetScreenType(PyObject *self, PyObject *
return _resultobj;
}
static void *SwigwxSystemOptionsTowxObject(void *ptr) {
wxSystemOptions *src;
wxObject *dest;
src = (wxSystemOptions *) ptr;
dest = (wxObject *) src;
return (void *) dest;
}
#define new_wxSystemOptions() (new wxSystemOptions())
static PyObject *_wrap_new_wxSystemOptions(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSystemOptions * _result;
char *_kwnames[] = { NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,":new_wxSystemOptions",_kwnames))
return NULL;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSystemOptions *)new_wxSystemOptions();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} if (_result) {
SWIG_MakePtr(_ptemp, (char *) _result,"_wxSystemOptions_p");
_resultobj = Py_BuildValue("s",_ptemp);
} else {
Py_INCREF(Py_None);
_resultobj = Py_None;
}
return _resultobj;
}
static PyObject *_wrap_wxSystemOptions_SetOption(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _arg0;
wxString * _arg1;
PyObject * _obj0 = 0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "name","value", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxSystemOptions_SetOption",_kwnames,&_obj0,&_obj1))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
_arg1 = wxString_in_helper(_obj1);
if (_arg1 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSystemOptions::SetOption(*_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj0)
delete _arg0;
}
{
if (_obj1)
delete _arg1;
}
return _resultobj;
}
static PyObject *_wrap_wxSystemOptions_SetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _arg0;
int _arg1;
PyObject * _obj0 = 0;
char *_kwnames[] = { "name","value", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxSystemOptions_SetOptionInt",_kwnames,&_obj0,&_arg1))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxSystemOptions::SetOption(*_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
{
if (_obj0)
delete _arg0;
}
return _resultobj;
}
static PyObject *_wrap_wxSystemOptions_GetOption(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxString * _result;
wxString * _arg0;
PyObject * _obj0 = 0;
char *_kwnames[] = { "name", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSystemOptions_GetOption",_kwnames,&_obj0))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxString (wxSystemOptions::GetOption(*_arg0));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{
#if wxUSE_UNICODE
_resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
#else
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
#endif
}
{
if (_obj0)
delete _arg0;
}
{
delete _result;
}
return _resultobj;
}
static PyObject *_wrap_wxSystemOptions_GetOptionInt(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxString * _arg0;
PyObject * _obj0 = 0;
char *_kwnames[] = { "name", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSystemOptions_GetOptionInt",_kwnames,&_obj0))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxSystemOptions::GetOptionInt(*_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj0)
delete _arg0;
}
return _resultobj;
}
static PyObject *_wrap_wxSystemOptions_HasOption(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxString * _arg0;
PyObject * _obj0 = 0;
char *_kwnames[] = { "name", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxSystemOptions_HasOption",_kwnames,&_obj0))
return NULL;
{
_arg0 = wxString_in_helper(_obj0);
if (_arg0 == NULL)
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxSystemOptions::HasOption(*_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
if (_obj0)
delete _arg0;
}
return _resultobj;
}
static void *SwigwxToolTipTowxObject(void *ptr) {
wxToolTip *src;
wxObject *dest;
@@ -11256,6 +11457,12 @@ static PyMethodDef misc2cMethods[] = {
{ "wxToolTip_GetTip", (PyCFunction) _wrap_wxToolTip_GetTip, METH_VARARGS | METH_KEYWORDS },
{ "wxToolTip_SetTip", (PyCFunction) _wrap_wxToolTip_SetTip, METH_VARARGS | METH_KEYWORDS },
{ "new_wxToolTip", (PyCFunction) _wrap_new_wxToolTip, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemOptions_HasOption", (PyCFunction) _wrap_wxSystemOptions_HasOption, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemOptions_GetOptionInt", (PyCFunction) _wrap_wxSystemOptions_GetOptionInt, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemOptions_GetOption", (PyCFunction) _wrap_wxSystemOptions_GetOption, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemOptions_SetOptionInt", (PyCFunction) _wrap_wxSystemOptions_SetOptionInt, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemOptions_SetOption", (PyCFunction) _wrap_wxSystemOptions_SetOption, METH_VARARGS | METH_KEYWORDS },
{ "new_wxSystemOptions", (PyCFunction) _wrap_new_wxSystemOptions, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_SetScreenType", (PyCFunction) _wrap_wxSystemSettings_SetScreenType, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_GetScreenType", (PyCFunction) _wrap_wxSystemSettings_GetScreenType, METH_VARARGS | METH_KEYWORDS },
{ "wxSystemSettings_HasFeature", (PyCFunction) _wrap_wxSystemSettings_HasFeature, METH_VARARGS | METH_KEYWORDS },
@@ -11391,6 +11598,7 @@ static struct { char *n1; char *n2; void *(*pcnv)(void *); } _swig_mapping[] = {
{ "_wxObject","_wxPyTimer",SwigwxPyTimerTowxObject},
{ "_wxObject","_wxGenericDragImage",SwigwxGenericDragImageTowxObject},
{ "_wxObject","_wxToolTip",SwigwxToolTipTowxObject},
{ "_wxObject","_wxSystemOptions",SwigwxSystemOptionsTowxObject},
{ "_signed_short","_WXTYPE",0},
{ "_signed_short","_short",0},
{ "_unsigned_char","_byte",0},
wxPython/src/gtk/misc2.py
+24
View File
@@ -72,6 +72,20 @@ class wxSystemSettings(wxSystemSettingsPtr):
class wxSystemOptionsPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
self.thisown = 0
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxSystemOptions instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
class wxSystemOptions(wxSystemOptionsPtr):
def __init__(self,*_args,**_kwargs):
self.this = misc2c.new_wxSystemOptions(*_args,**_kwargs)
self.thisown = 1
class wxToolTipPtr(wxObjectPtr):
def __init__(self,this):
self.this = this
@@ -1311,6 +1325,16 @@ wxSystemSettings_GetScreenType = misc2c.wxSystemSettings_GetScreenType
wxSystemSettings_SetScreenType = misc2c.wxSystemSettings_SetScreenType
wxSystemOptions_SetOption = misc2c.wxSystemOptions_SetOption
wxSystemOptions_SetOptionInt = misc2c.wxSystemOptions_SetOptionInt
wxSystemOptions_GetOption = misc2c.wxSystemOptions_GetOption
wxSystemOptions_GetOptionInt = misc2c.wxSystemOptions_GetOptionInt
wxSystemOptions_HasOption = misc2c.wxSystemOptions_HasOption
wxToolTip_Enable = misc2c.wxToolTip_Enable
wxToolTip_SetDelay = misc2c.wxToolTip_SetDelay
wxPython/src/gtk/stattool.cpp
+45 -4
View File
@@ -2290,6 +2290,35 @@ static PyObject *_wrap_wxToolBarBase_SetToolClientData(PyObject *self, PyObject
return _resultobj;
}
#define wxToolBarBase_GetToolPos(_swigobj,_swigarg0) (_swigobj->GetToolPos(_swigarg0))
static PyObject *_wrap_wxToolBarBase_GetToolPos(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxToolBarBase * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","id", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxToolBarBase_GetToolPos",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_GetToolPos. Expected _wxToolBarBase_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxToolBarBase_GetToolPos(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxToolBarBase_GetToolState(_swigobj,_swigarg0) (_swigobj->GetToolState(_swigarg0))
static PyObject *_wrap_wxToolBarBase_GetToolState(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -3061,7 +3090,7 @@ static PyObject *_wrap_new_wxToolBar(PyObject *self, PyObject *args, PyObject *k
wxWindowID _arg1;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
long _arg4 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL);
wxString * _arg5 = (wxString *) &wxPyToolBarNameStr;
PyObject * _argo0 = 0;
wxPoint temp;
@@ -3155,7 +3184,7 @@ static PyObject *_wrap_wxToolBar_Create(PyObject *self, PyObject *args, PyObject
wxWindowID _arg2;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
long _arg5 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL);
wxString * _arg6 = (wxString *) &wxPyToolBarNameStr;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
@@ -3293,7 +3322,7 @@ static PyObject *_wrap_new_wxToolBarSimple(PyObject *self, PyObject *args, PyObj
wxWindowID _arg1;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
long _arg4 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
long _arg4 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL);
wxString * _arg5 = (wxString *) &wxPyToolBarNameStr;
PyObject * _argo0 = 0;
wxPoint temp;
@@ -3387,7 +3416,7 @@ static PyObject *_wrap_wxToolBarSimple_Create(PyObject *self, PyObject *args, Py
wxWindowID _arg2;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) wxNO_BORDER|wxTB_HORIZONTAL;
long _arg5 = (long ) wxNO_BORDER|(wxTB_HORIZONTAL);
wxString * _arg6 = (wxString *) &wxPyToolBarNameStr;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
@@ -3509,6 +3538,7 @@ static PyMethodDef stattoolcMethods[] = {
{ "wxToolBarBase_SetToolShortHelp", (PyCFunction) _wrap_wxToolBarBase_SetToolShortHelp, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetToolEnabled", (PyCFunction) _wrap_wxToolBarBase_GetToolEnabled, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetToolState", (PyCFunction) _wrap_wxToolBarBase_GetToolState, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetToolPos", (PyCFunction) _wrap_wxToolBarBase_GetToolPos, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_SetToolClientData", (PyCFunction) _wrap_wxToolBarBase_SetToolClientData, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_GetToolClientData", (PyCFunction) _wrap_wxToolBarBase_GetToolClientData, METH_VARARGS | METH_KEYWORDS },
{ "wxToolBarBase_SetToggle", (PyCFunction) _wrap_wxToolBarBase_SetToggle, METH_VARARGS | METH_KEYWORDS },
@@ -3705,6 +3735,17 @@ SWIGEXPORT(void) initstattoolc() {
PyDict_SetItemString(d,"wxTOOL_STYLE_BUTTON", PyInt_FromLong((long) wxTOOL_STYLE_BUTTON));
PyDict_SetItemString(d,"wxTOOL_STYLE_SEPARATOR", PyInt_FromLong((long) wxTOOL_STYLE_SEPARATOR));
PyDict_SetItemString(d,"wxTOOL_STYLE_CONTROL", PyInt_FromLong((long) wxTOOL_STYLE_CONTROL));
PyDict_SetItemString(d,"wxTB_HORIZONTAL", PyInt_FromLong((long) wxTB_HORIZONTAL));
PyDict_SetItemString(d,"wxTB_VERTICAL", PyInt_FromLong((long) wxTB_VERTICAL));
PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS));
PyDict_SetItemString(d,"wxTB_FLAT", PyInt_FromLong((long) wxTB_FLAT));
PyDict_SetItemString(d,"wxTB_DOCKABLE", PyInt_FromLong((long) wxTB_DOCKABLE));
PyDict_SetItemString(d,"wxTB_NOICONS", PyInt_FromLong((long) wxTB_NOICONS));
PyDict_SetItemString(d,"wxTB_TEXT", PyInt_FromLong((long) wxTB_TEXT));
PyDict_SetItemString(d,"wxTB_NODIVIDER", PyInt_FromLong((long) wxTB_NODIVIDER));
PyDict_SetItemString(d,"wxTB_NOALIGN", PyInt_FromLong((long) wxTB_NOALIGN));
PyDict_SetItemString(d,"wxTB_HORZ_LAYOUT", PyInt_FromLong((long) wxTB_HORZ_LAYOUT));
PyDict_SetItemString(d,"wxTB_HORZ_TEXT", PyInt_FromLong((long) wxTB_HORZ_TEXT));
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/gtk/stattool.py
+14
View File
@@ -241,6 +241,9 @@ class wxToolBarBasePtr(wxControlPtr):
def SetToolClientData(self, *_args, **_kwargs):
val = stattoolc.wxToolBarBase_SetToolClientData(self, *_args, **_kwargs)
return val
def GetToolPos(self, *_args, **_kwargs):
val = stattoolc.wxToolBarBase_GetToolPos(self, *_args, **_kwargs)
return val
def GetToolState(self, *_args, **_kwargs):
val = stattoolc.wxToolBarBase_GetToolState(self, *_args, **_kwargs)
return val
@@ -512,3 +515,14 @@ def wxPreToolBarSimple(*_args,**_kwargs):
wxTOOL_STYLE_BUTTON = stattoolc.wxTOOL_STYLE_BUTTON
wxTOOL_STYLE_SEPARATOR = stattoolc.wxTOOL_STYLE_SEPARATOR
wxTOOL_STYLE_CONTROL = stattoolc.wxTOOL_STYLE_CONTROL
wxTB_HORIZONTAL = stattoolc.wxTB_HORIZONTAL
wxTB_VERTICAL = stattoolc.wxTB_VERTICAL
wxTB_3DBUTTONS = stattoolc.wxTB_3DBUTTONS
wxTB_FLAT = stattoolc.wxTB_FLAT
wxTB_DOCKABLE = stattoolc.wxTB_DOCKABLE
wxTB_NOICONS = stattoolc.wxTB_NOICONS
wxTB_TEXT = stattoolc.wxTB_TEXT
wxTB_NODIVIDER = stattoolc.wxTB_NODIVIDER
wxTB_NOALIGN = stattoolc.wxTB_NOALIGN
wxTB_HORZ_LAYOUT = stattoolc.wxTB_HORZ_LAYOUT
wxTB_HORZ_TEXT = stattoolc.wxTB_HORZ_TEXT
wxPython/src/gtk/windows.cpp
+168 -33
View File
@@ -1728,34 +1728,6 @@ static PyObject *_wrap_wxWindow_GetBackgroundColour(PyObject *self, PyObject *ar
return _resultobj;
}
#define wxWindow_GetBorder(_swigobj) (_swigobj->GetBorder())
static PyObject *_wrap_wxWindow_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxBorder _result;
wxWindow * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetBorder",_kwnames,&_argo0))
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 wxWindow_GetBorder. Expected _wxWindow_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxBorder )wxWindow_GetBorder(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static PyObject * wxWindow_GetChildren(wxWindow *self) {
wxWindowList& list = self->GetChildren();
return wxPy_ConvertList(&list, "wxWindow");
@@ -5109,15 +5081,16 @@ static PyObject *_wrap_wxWindow_TransferDataToWindow(PyObject *self, PyObject *a
return _resultobj;
}
#define wxWindow_UpdateWindowUI(_swigobj) (_swigobj->UpdateWindowUI())
#define wxWindow_UpdateWindowUI(_swigobj,_swigarg0) (_swigobj->UpdateWindowUI(_swigarg0))
static PyObject *_wrap_wxWindow_UpdateWindowUI(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxWindow * _arg0;
long _arg1 = (long ) wxUPDATE_UI_NONE;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
char *_kwnames[] = { "self","flags", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_UpdateWindowUI",_kwnames,&_argo0))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|l:wxWindow_UpdateWindowUI",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -5128,7 +5101,7 @@ static PyObject *_wrap_wxWindow_UpdateWindowUI(PyObject *self, PyObject *args, P
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxWindow_UpdateWindowUI(_arg0);
wxWindow_UpdateWindowUI(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@@ -6406,6 +6379,78 @@ static PyObject *_wrap_wxWindow_GetAcceleratorTable(PyObject *self, PyObject *ar
return _resultobj;
}
static bool wxWindow_RegisterHotKey(wxWindow *self,int hotkeyId,int modifiers,int keycode) {
#if wxUSE_HOTKEY
return self->RegisterHotKey(hotkeyId, modifiers, keycode);
#else
return FALSE;
#endif
}
static PyObject *_wrap_wxWindow_RegisterHotKey(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxWindow * _arg0;
int _arg1;
int _arg2;
int _arg3;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","hotkeyId","modifiers","keycode", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oiii:wxWindow_RegisterHotKey",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3))
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 wxWindow_RegisterHotKey. Expected _wxWindow_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxWindow_RegisterHotKey(_arg0,_arg1,_arg2,_arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static bool wxWindow_UnregisterHotKey(wxWindow *self,int hotkeyId) {
#if wxUSE_HOTKEY
return self->UnregisterHotKey(hotkeyId);
#else
return FALSE;
#endif
}
static PyObject *_wrap_wxWindow_UnregisterHotKey(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
bool _result;
wxWindow * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","hotkeyId", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWindow_UnregisterHotKey",_kwnames,&_argo0,&_arg1))
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 wxWindow_UnregisterHotKey. Expected _wxWindow_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxWindow_UnregisterHotKey(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxWindow_GetDefaultItem(_swigobj) (_swigobj->GetDefaultItem())
static PyObject *_wrap_wxWindow_GetDefaultItem(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -6699,6 +6744,63 @@ static PyObject *_wrap_wxWindow_GetThemeEnabled(PyObject *self, PyObject *args,
return _resultobj;
}
#define wxWindow_GetBorderFlags(_swigobj,_swigarg0) (_swigobj->GetBorder(_swigarg0))
static PyObject *_wrap_wxWindow_GetBorderFlags(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxBorder _result;
wxWindow * _arg0;
long _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","flags", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Ol:wxWindow_GetBorderFlags",_kwnames,&_argo0,&_arg1))
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 wxWindow_GetBorderFlags. Expected _wxWindow_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxBorder )wxWindow_GetBorderFlags(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxWindow_GetBorder(_swigobj) (_swigobj->GetBorder())
static PyObject *_wrap_wxWindow_GetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxBorder _result;
wxWindow * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWindow_GetBorder",_kwnames,&_argo0))
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 wxWindow_GetBorder. Expected _wxWindow_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxBorder )wxWindow_GetBorder(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void *SwigwxPanelTowxWindow(void *ptr) {
wxPanel *src;
wxWindow *dest;
@@ -8966,6 +9068,35 @@ static PyObject *_wrap_wxMenu_FindItemById(PyObject *self, PyObject *args, PyObj
return _resultobj;
}
#define wxMenu_FindItemByPosition(_swigobj,_swigarg0) (_swigobj->FindItemByPosition(_swigarg0))
static PyObject *_wrap_wxMenu_FindItemByPosition(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxMenuItem * _result;
wxMenu * _arg0;
size_t _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","position", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxMenu_FindItemByPosition",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxMenu_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_FindItemByPosition. Expected _wxMenu_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxMenuItem *)wxMenu_FindItemByPosition(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
#define wxMenu_GetTitle(_swigobj) (_swigobj->GetTitle())
static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -11586,6 +11717,7 @@ static PyMethodDef windowscMethods[] = {
{ "wxMenu_GetLabel", (PyCFunction) _wrap_wxMenu_GetLabel, METH_VARARGS | METH_KEYWORDS },
{ "wxMenu_SetTitle", (PyCFunction) _wrap_wxMenu_SetTitle, METH_VARARGS | METH_KEYWORDS },
{ "wxMenu_GetTitle", (PyCFunction) _wrap_wxMenu_GetTitle, METH_VARARGS | METH_KEYWORDS },
{ "wxMenu_FindItemByPosition", (PyCFunction) _wrap_wxMenu_FindItemByPosition, METH_VARARGS | METH_KEYWORDS },
{ "wxMenu_FindItemById", (PyCFunction) _wrap_wxMenu_FindItemById, METH_VARARGS | METH_KEYWORDS },
{ "wxMenu_FindItem", (PyCFunction) _wrap_wxMenu_FindItem, METH_VARARGS | METH_KEYWORDS },
{ "wxMenu_IsEnabled", (PyCFunction) _wrap_wxMenu_IsEnabled, METH_VARARGS | METH_KEYWORDS },
@@ -11640,6 +11772,8 @@ static PyMethodDef windowscMethods[] = {
{ "wxPanel_Create", (PyCFunction) _wrap_wxPanel_Create, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPrePanel", (PyCFunction) _wrap_new_wxPrePanel, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPanel", (PyCFunction) _wrap_new_wxPanel, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetBorder", (PyCFunction) _wrap_wxWindow_GetBorder, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetBorderFlags", (PyCFunction) _wrap_wxWindow_GetBorderFlags, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetThemeEnabled", (PyCFunction) _wrap_wxWindow_GetThemeEnabled, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetThemeEnabled", (PyCFunction) _wrap_wxWindow_SetThemeEnabled, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_HasCapture", (PyCFunction) _wrap_wxWindow_HasCapture, METH_VARARGS | METH_KEYWORDS },
@@ -11650,6 +11784,8 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_SetTmpDefaultItem", (PyCFunction) _wrap_wxWindow_SetTmpDefaultItem, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetDefaultItem", (PyCFunction) _wrap_wxWindow_SetDefaultItem, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetDefaultItem", (PyCFunction) _wrap_wxWindow_GetDefaultItem, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_UnregisterHotKey", (PyCFunction) _wrap_wxWindow_UnregisterHotKey, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_RegisterHotKey", (PyCFunction) _wrap_wxWindow_RegisterHotKey, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetAcceleratorTable", (PyCFunction) _wrap_wxWindow_GetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_SetAcceleratorTable", (PyCFunction) _wrap_wxWindow_SetAcceleratorTable, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_PrevControlId", (PyCFunction) _wrap_wxWindow_PrevControlId, METH_VARARGS | METH_KEYWORDS },
@@ -11791,7 +11927,6 @@ static PyMethodDef windowscMethods[] = {
{ "wxWindow_GetCharWidth", (PyCFunction) _wrap_wxWindow_GetCharWidth, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetCharHeight", (PyCFunction) _wrap_wxWindow_GetCharHeight, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetChildren", (PyCFunction) _wrap_wxWindow_GetChildren, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetBorder", (PyCFunction) _wrap_wxWindow_GetBorder, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_GetBackgroundColour", (PyCFunction) _wrap_wxWindow_GetBackgroundColour, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_FitInside", (PyCFunction) _wrap_wxWindow_FitInside, METH_VARARGS | METH_KEYWORDS },
{ "wxWindow_Fit", (PyCFunction) _wrap_wxWindow_Fit, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/windows.py
+15 -3
View File
@@ -181,9 +181,6 @@ class wxWindowPtr(wxEvtHandlerPtr):
val = windowsc.wxWindow_GetBackgroundColour(self, *_args, **_kwargs)
if val: val = wxColourPtr(val) ; val.thisown = 1
return val
def GetBorder(self, *_args, **_kwargs):
val = windowsc.wxWindow_GetBorder(self, *_args, **_kwargs)
return val
def GetChildren(self, *_args, **_kwargs):
val = windowsc.wxWindow_GetChildren(self, *_args, **_kwargs)
return val
@@ -622,6 +619,12 @@ class wxWindowPtr(wxEvtHandlerPtr):
val = windowsc.wxWindow_GetAcceleratorTable(self, *_args, **_kwargs)
if val: val = wxAcceleratorTablePtr(val)
return val
def RegisterHotKey(self, *_args, **_kwargs):
val = windowsc.wxWindow_RegisterHotKey(self, *_args, **_kwargs)
return val
def UnregisterHotKey(self, *_args, **_kwargs):
val = windowsc.wxWindow_UnregisterHotKey(self, *_args, **_kwargs)
return val
def GetDefaultItem(self, *_args, **_kwargs):
val = windowsc.wxWindow_GetDefaultItem(self, *_args, **_kwargs)
return val
@@ -649,6 +652,12 @@ class wxWindowPtr(wxEvtHandlerPtr):
def GetThemeEnabled(self, *_args, **_kwargs):
val = windowsc.wxWindow_GetThemeEnabled(self, *_args, **_kwargs)
return val
def GetBorderFlags(self, *_args, **_kwargs):
val = windowsc.wxWindow_GetBorderFlags(self, *_args, **_kwargs)
return val
def GetBorder(self, *_args, **_kwargs):
val = windowsc.wxWindow_GetBorder(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxWindow instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
# replaces broken shadow method
@@ -886,6 +895,9 @@ class wxMenuPtr(wxEvtHandlerPtr):
def FindItemById(self, *_args, **_kwargs):
val = windowsc.wxMenu_FindItemById(self, *_args, **_kwargs)
return val
def FindItemByPosition(self, *_args, **_kwargs):
val = windowsc.wxMenu_FindItemByPosition(self, *_args, **_kwargs)
return val
def GetTitle(self, *_args, **_kwargs):
val = windowsc.wxMenu_GetTitle(self, *_args, **_kwargs)
return val
wxPython/src/gtk/windows2.cpp
+179 -64
View File
@@ -700,63 +700,32 @@ static PyObject *_wrap_wxNotebook_GetPageCount(PyObject *self, PyObject *args, P
return _resultobj;
}
#define wxNotebook_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0))
static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
#define wxNotebook_GetPage(_swigobj,_swigarg0) (_swigobj->GetPage(_swigarg0))
static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxWindow * _result;
wxNotebook * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","page", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetSelection. Expected _wxNotebook_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPage. Expected _wxNotebook_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (int )wxNotebook_SetSelection(_arg0,_arg1);
_result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
#define wxNotebook_AdvanceSelection(_swigobj,_swigarg0) (_swigobj->AdvanceSelection(_swigarg0))
static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxNotebook * _arg0;
bool _arg1 = (bool ) TRUE;
PyObject * _argo0 = 0;
int tempbool1 = (int) TRUE;
char *_kwnames[] = { "self","forward", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AdvanceSelection. Expected _wxNotebook_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_AdvanceSelection(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
}{ _resultobj = wxPyMake_wxObject(_result); }
return _resultobj;
}
@@ -1005,7 +974,7 @@ static PyObject *_wrap_wxNotebook_SetPageImage(PyObject *self, PyObject *args, P
int _arg1;
int _arg2;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","page","image", NULL };
char *_kwnames[] = { "self","page","nImage", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oii:wxNotebook_SetPageImage",_kwnames,&_argo0,&_arg1,&_arg2))
@@ -1127,6 +1096,80 @@ static PyObject *_wrap_wxNotebook_SetPadding(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxNotebook_SetTabSize(_swigobj,_swigarg0) (_swigobj->SetTabSize(_swigarg0))
static PyObject *_wrap_wxNotebook_SetTabSize(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxNotebook * _arg0;
wxSize * _arg1;
PyObject * _argo0 = 0;
wxSize temp;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","sz", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_SetTabSize",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetTabSize. Expected _wxNotebook_p.");
return NULL;
}
}
{
_arg1 = &temp;
if (! wxSize_helper(_obj1, &_arg1))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_SetTabSize(_arg0,*_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxNotebook_CalcSizeFromPage(_swigobj,_swigarg0) (_swigobj->CalcSizeFromPage(_swigarg0))
static PyObject *_wrap_wxNotebook_CalcSizeFromPage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSize * _result;
wxNotebook * _arg0;
wxSize * _arg1;
PyObject * _argo0 = 0;
wxSize temp;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","sizePage", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_CalcSizeFromPage",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_CalcSizeFromPage. Expected _wxNotebook_p.");
return NULL;
}
}
{
_arg1 = &temp;
if (! wxSize_helper(_obj1, &_arg1))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = new wxSize (wxNotebook_CalcSizeFromPage(_arg0,*_arg1));
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p");
_resultobj = Py_BuildValue("s",_ptemp);
return _resultobj;
}
#define wxNotebook_DeletePage(_swigobj,_swigarg0) (_swigobj->DeletePage(_swigarg0))
static PyObject *_wrap_wxNotebook_DeletePage(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -1220,15 +1263,16 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObje
wxNotebook * _arg0;
wxWindow * _arg1;
wxString * _arg2;
int _arg3 = (int ) FALSE;
bool _arg3 = (bool ) FALSE;
int _arg4 = (int ) -1;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
PyObject * _obj2 = 0;
char *_kwnames[] = { "self","page","text","select","imageId", NULL };
int tempbool3 = (int) FALSE;
char *_kwnames[] = { "self","page","text","telect","imageId", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&_arg3,&_arg4))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OOO|ii:wxNotebook_AddPage",_kwnames,&_argo0,&_argo1,&_obj2,&tempbool3,&_arg4))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1249,6 +1293,7 @@ static PyObject *_wrap_wxNotebook_AddPage(PyObject *self, PyObject *args, PyObje
if (_arg2 == NULL)
return NULL;
}
_arg3 = (bool ) tempbool3;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (bool )wxNotebook_AddPage(_arg0,_arg1,*_arg2,_arg3,_arg4);
@@ -1316,58 +1361,104 @@ static PyObject *_wrap_wxNotebook_InsertPage(PyObject *self, PyObject *args, PyO
return _resultobj;
}
#define wxNotebook_GetPage(_swigobj,_swigarg0) (_swigobj->GetPage(_swigarg0))
static PyObject *_wrap_wxNotebook_GetPage(PyObject *self, PyObject *args, PyObject *kwargs) {
#define wxNotebook_SetSelection(_swigobj,_swigarg0) (_swigobj->SetSelection(_swigarg0))
static PyObject *_wrap_wxNotebook_SetSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxWindow * _result;
int _result;
wxNotebook * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","page", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_GetPage",_kwnames,&_argo0,&_arg1))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxNotebook_SetSelection",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_GetPage. Expected _wxNotebook_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_SetSelection. Expected _wxNotebook_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWindow *)wxNotebook_GetPage(_arg0,_arg1);
_result = (int )wxNotebook_SetSelection(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxObject(_result); }
} _resultobj = Py_BuildValue("i",_result);
return _resultobj;
}
static void wxNotebook_ResizeChildren(wxNotebook *self) {
wxSizeEvent evt(self->GetClientSize());
self->GetEventHandler()->ProcessEvent(evt);
}
static PyObject *_wrap_wxNotebook_ResizeChildren(PyObject *self, PyObject *args, PyObject *kwargs) {
#define wxNotebook_HitTest(_swigobj,_swigarg0,_swigarg1) (_swigobj->HitTest(_swigarg0,_swigarg1))
static PyObject *_wrap_wxNotebook_HitTest(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
int _result;
wxNotebook * _arg0;
wxPoint * _arg1;
long * _arg2;
long temp;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
wxPoint temp0;
PyObject * _obj1 = 0;
char *_kwnames[] = { "self","pt", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxNotebook_ResizeChildren",_kwnames,&_argo0))
{
_arg2 = &temp;
}
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxNotebook_HitTest",_kwnames,&_argo0,&_obj1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_ResizeChildren. Expected _wxNotebook_p.");
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_HitTest. Expected _wxNotebook_p.");
return NULL;
}
}
{
_arg1 = &temp0;
if (! wxPoint_helper(_obj1, &_arg1))
return NULL;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_ResizeChildren(_arg0);
_result = (int )wxNotebook_HitTest(_arg0,*_arg1,_arg2);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} _resultobj = Py_BuildValue("i",_result);
{
PyObject *o;
o = PyInt_FromLong((long) (*_arg2));
_resultobj = t_output_helper(_resultobj, o);
}
return _resultobj;
}
#define wxNotebook_AdvanceSelection(_swigobj,_swigarg0) (_swigobj->AdvanceSelection(_swigarg0))
static PyObject *_wrap_wxNotebook_AdvanceSelection(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxNotebook * _arg0;
bool _arg1 = (bool ) TRUE;
PyObject * _argo0 = 0;
int tempbool1 = (int) TRUE;
char *_kwnames[] = { "self","forward", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|i:wxNotebook_AdvanceSelection",_kwnames,&_argo0,&tempbool1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxNotebook_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxNotebook_AdvanceSelection. Expected _wxNotebook_p.");
return NULL;
}
}
_arg1 = (bool ) tempbool1;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxNotebook_AdvanceSelection(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@@ -1617,7 +1708,7 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args, PyOb
wxWindowID _arg1;
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
long _arg4 = (long ) wxSP_3D|wxCLIP_CHILDREN;
long _arg4 = (long ) (wxSP_3D)|wxCLIP_CHILDREN;
wxString * _arg5 = (wxString *) &wxPySplitterNameStr;
PyObject * _argo0 = 0;
wxPoint temp;
@@ -1711,7 +1802,7 @@ static PyObject *_wrap_wxSplitterWindow_Create(PyObject *self, PyObject *args, P
wxWindowID _arg2;
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
long _arg5 = (long ) wxSP_3D|wxCLIP_CHILDREN;
long _arg5 = (long ) (wxSP_3D)|wxCLIP_CHILDREN;
wxString * _arg6 = (wxString *) &wxPySplitterNameStr;
PyObject * _argo0 = 0;
PyObject * _argo1 = 0;
@@ -4749,13 +4840,16 @@ static PyMethodDef windows2cMethods[] = {
{ "wxSplitterEvent_GetX", (PyCFunction) _wrap_wxSplitterEvent_GetX, METH_VARARGS | METH_KEYWORDS },
{ "wxSplitterEvent_GetSashPosition", (PyCFunction) _wrap_wxSplitterEvent_GetSashPosition, METH_VARARGS | METH_KEYWORDS },
{ "new_wxSplitterEvent", (PyCFunction) _wrap_new_wxSplitterEvent, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_ResizeChildren", (PyCFunction) _wrap_wxNotebook_ResizeChildren, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_GetPage", (PyCFunction) _wrap_wxNotebook_GetPage, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_AdvanceSelection", (PyCFunction) _wrap_wxNotebook_AdvanceSelection, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_HitTest", (PyCFunction) _wrap_wxNotebook_HitTest, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_SetSelection", (PyCFunction) _wrap_wxNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_InsertPage", (PyCFunction) _wrap_wxNotebook_InsertPage, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_AddPage", (PyCFunction) _wrap_wxNotebook_AddPage, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_DeleteAllPages", (PyCFunction) _wrap_wxNotebook_DeleteAllPages, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_RemovePage", (PyCFunction) _wrap_wxNotebook_RemovePage, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_DeletePage", (PyCFunction) _wrap_wxNotebook_DeletePage, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_CalcSizeFromPage", (PyCFunction) _wrap_wxNotebook_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_SetTabSize", (PyCFunction) _wrap_wxNotebook_SetTabSize, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_SetPadding", (PyCFunction) _wrap_wxNotebook_SetPadding, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_SetPageSize", (PyCFunction) _wrap_wxNotebook_SetPageSize, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_GetRowCount", (PyCFunction) _wrap_wxNotebook_GetRowCount, METH_VARARGS | METH_KEYWORDS },
@@ -4767,8 +4861,7 @@ static PyMethodDef windows2cMethods[] = {
{ "wxNotebook_GetPageText", (PyCFunction) _wrap_wxNotebook_GetPageText, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_SetPageText", (PyCFunction) _wrap_wxNotebook_SetPageText, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_GetSelection", (PyCFunction) _wrap_wxNotebook_GetSelection, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_AdvanceSelection", (PyCFunction) _wrap_wxNotebook_AdvanceSelection, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_SetSelection", (PyCFunction) _wrap_wxNotebook_SetSelection, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_GetPage", (PyCFunction) _wrap_wxNotebook_GetPage, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_GetPageCount", (PyCFunction) _wrap_wxNotebook_GetPageCount, METH_VARARGS | METH_KEYWORDS },
{ "wxNotebook_Create", (PyCFunction) _wrap_wxNotebook_Create, METH_VARARGS | METH_KEYWORDS },
{ "new_wxPreNotebook", (PyCFunction) _wrap_new_wxPreNotebook, METH_VARARGS | METH_KEYWORDS },
@@ -4920,6 +5013,16 @@ SWIGEXPORT(void) initwindows2c() {
d = PyModule_GetDict(m);
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED));
PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING));
PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH));
PyDict_SetItemString(d,"wxNB_TOP", PyInt_FromLong((long) wxNB_TOP));
PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT));
PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT));
PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM));
PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE));
PyDict_SetItemString(d,"wxNB_HITTEST_NOWHERE", PyInt_FromLong((long) wxNB_HITTEST_NOWHERE));
PyDict_SetItemString(d,"wxNB_HITTEST_ONICON", PyInt_FromLong((long) wxNB_HITTEST_ONICON));
PyDict_SetItemString(d,"wxNB_HITTEST_ONLABEL", PyInt_FromLong((long) wxNB_HITTEST_ONLABEL));
PyDict_SetItemString(d,"wxNB_HITTEST_ONITEM", PyInt_FromLong((long) wxNB_HITTEST_ONITEM));
PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING));
PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED));
PyDict_SetItemString(d,"wxEVT_COMMAND_SPLITTER_UNSPLIT", PyInt_FromLong((long) wxEVT_COMMAND_SPLITTER_UNSPLIT));
@@ -4929,6 +5032,18 @@ SWIGEXPORT(void) initwindows2c() {
PyDict_SetItemString(d,"wxSPLIT_DRAG_NONE", PyInt_FromLong((long) wxSPLIT_DRAG_NONE));
PyDict_SetItemString(d,"wxSPLIT_DRAG_DRAGGING", PyInt_FromLong((long) wxSPLIT_DRAG_DRAGGING));
PyDict_SetItemString(d,"wxSPLIT_DRAG_LEFT_DOWN", PyInt_FromLong((long) wxSPLIT_DRAG_LEFT_DOWN));
PyDict_SetItemString(d,"wxSP_VERTICAL", PyInt_FromLong((long) wxSP_VERTICAL));
PyDict_SetItemString(d,"wxSP_HORIZONTAL", PyInt_FromLong((long) wxSP_HORIZONTAL));
PyDict_SetItemString(d,"wxSP_ARROW_KEYS", PyInt_FromLong((long) wxSP_ARROW_KEYS));
PyDict_SetItemString(d,"wxSP_WRAP", PyInt_FromLong((long) wxSP_WRAP));
PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER));
PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D));
PyDict_SetItemString(d,"wxSP_3DSASH", PyInt_FromLong((long) wxSP_3DSASH));
PyDict_SetItemString(d,"wxSP_3DBORDER", PyInt_FromLong((long) wxSP_3DBORDER));
PyDict_SetItemString(d,"wxSP_FULLSASH", PyInt_FromLong((long) wxSP_FULLSASH));
PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER));
PyDict_SetItemString(d,"wxSP_LIVE_UPDATE", PyInt_FromLong((long) wxSP_LIVE_UPDATE));
PyDict_SetItemString(d,"wxSP_PERMIT_UNSPLIT", PyInt_FromLong((long) wxSP_PERMIT_UNSPLIT));
{
int i;
for (i = 0; _swig_mapping[i].n1; i++)
wxPython/src/gtk/windows2.py
+38 -9
View File
@@ -51,11 +51,8 @@ class wxNotebookPtr(wxControlPtr):
def GetPageCount(self, *_args, **_kwargs):
val = windows2c.wxNotebook_GetPageCount(self, *_args, **_kwargs)
return val
def SetSelection(self, *_args, **_kwargs):
val = windows2c.wxNotebook_SetSelection(self, *_args, **_kwargs)
return val
def AdvanceSelection(self, *_args, **_kwargs):
val = windows2c.wxNotebook_AdvanceSelection(self, *_args, **_kwargs)
def GetPage(self, *_args, **_kwargs):
val = windows2c.wxNotebook_GetPage(self, *_args, **_kwargs)
return val
def GetSelection(self, *_args, **_kwargs):
val = windows2c.wxNotebook_GetSelection(self, *_args, **_kwargs)
@@ -91,6 +88,13 @@ class wxNotebookPtr(wxControlPtr):
def SetPadding(self, *_args, **_kwargs):
val = windows2c.wxNotebook_SetPadding(self, *_args, **_kwargs)
return val
def SetTabSize(self, *_args, **_kwargs):
val = windows2c.wxNotebook_SetTabSize(self, *_args, **_kwargs)
return val
def CalcSizeFromPage(self, *_args, **_kwargs):
val = windows2c.wxNotebook_CalcSizeFromPage(self, *_args, **_kwargs)
if val: val = wxSizePtr(val) ; val.thisown = 1
return val
def DeletePage(self, *_args, **_kwargs):
val = windows2c.wxNotebook_DeletePage(self, *_args, **_kwargs)
return val
@@ -106,11 +110,14 @@ class wxNotebookPtr(wxControlPtr):
def InsertPage(self, *_args, **_kwargs):
val = windows2c.wxNotebook_InsertPage(self, *_args, **_kwargs)
return val
def GetPage(self, *_args, **_kwargs):
val = windows2c.wxNotebook_GetPage(self, *_args, **_kwargs)
def SetSelection(self, *_args, **_kwargs):
val = windows2c.wxNotebook_SetSelection(self, *_args, **_kwargs)
return val
def ResizeChildren(self, *_args, **_kwargs):
val = windows2c.wxNotebook_ResizeChildren(self, *_args, **_kwargs)
def HitTest(self, *_args, **_kwargs):
val = windows2c.wxNotebook_HitTest(self, *_args, **_kwargs)
return val
def AdvanceSelection(self, *_args, **_kwargs):
val = windows2c.wxNotebook_AdvanceSelection(self, *_args, **_kwargs)
return val
def __repr__(self):
return "<%s.%s instance; proxy of C++ wxNotebook instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this)
@@ -483,6 +490,16 @@ class wxPyPanel(wxPyPanelPtr):
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED = windows2c.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED
wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING = windows2c.wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING
wxNB_FIXEDWIDTH = windows2c.wxNB_FIXEDWIDTH
wxNB_TOP = windows2c.wxNB_TOP
wxNB_LEFT = windows2c.wxNB_LEFT
wxNB_RIGHT = windows2c.wxNB_RIGHT
wxNB_BOTTOM = windows2c.wxNB_BOTTOM
wxNB_MULTILINE = windows2c.wxNB_MULTILINE
wxNB_HITTEST_NOWHERE = windows2c.wxNB_HITTEST_NOWHERE
wxNB_HITTEST_ONICON = windows2c.wxNB_HITTEST_ONICON
wxNB_HITTEST_ONLABEL = windows2c.wxNB_HITTEST_ONLABEL
wxNB_HITTEST_ONITEM = windows2c.wxNB_HITTEST_ONITEM
wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING = windows2c.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGING
wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED = windows2c.wxEVT_COMMAND_SPLITTER_SASH_POS_CHANGED
wxEVT_COMMAND_SPLITTER_UNSPLIT = windows2c.wxEVT_COMMAND_SPLITTER_UNSPLIT
@@ -492,3 +509,15 @@ wxSPLIT_VERTICAL = windows2c.wxSPLIT_VERTICAL
wxSPLIT_DRAG_NONE = windows2c.wxSPLIT_DRAG_NONE
wxSPLIT_DRAG_DRAGGING = windows2c.wxSPLIT_DRAG_DRAGGING
wxSPLIT_DRAG_LEFT_DOWN = windows2c.wxSPLIT_DRAG_LEFT_DOWN
wxSP_VERTICAL = windows2c.wxSP_VERTICAL
wxSP_HORIZONTAL = windows2c.wxSP_HORIZONTAL
wxSP_ARROW_KEYS = windows2c.wxSP_ARROW_KEYS
wxSP_WRAP = windows2c.wxSP_WRAP
wxSP_NOBORDER = windows2c.wxSP_NOBORDER
wxSP_3D = windows2c.wxSP_3D
wxSP_3DSASH = windows2c.wxSP_3DSASH
wxSP_3DBORDER = windows2c.wxSP_3DBORDER
wxSP_FULLSASH = windows2c.wxSP_FULLSASH
wxSP_BORDER = windows2c.wxSP_BORDER
wxSP_LIVE_UPDATE = windows2c.wxSP_LIVE_UPDATE
wxSP_PERMIT_UNSPLIT = windows2c.wxSP_PERMIT_UNSPLIT
wxPython/src/gtk/wizard.cpp
+64 -4
View File
@@ -1640,7 +1640,7 @@ static void *SwigwxWizardTowxObject(void *ptr) {
return (void *) dest;
}
#define new_wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4))
#define new_wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxWizard(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5))
static PyObject *_wrap_new_wxWizard(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxWizard * _result;
@@ -1649,16 +1649,17 @@ static PyObject *_wrap_new_wxWizard(PyObject *self, PyObject *args, PyObject *kw
wxString * _arg2 = (wxString *) &wxEmptyString;
wxBitmap * _arg3 = (wxBitmap *) &wxNullBitmap;
wxPoint * _arg4 = (wxPoint *) &wxDefaultPosition;
long _arg5 = (long ) wxDEFAULT_DIALOG_STYLE;
PyObject * _argo0 = 0;
PyObject * _obj2 = 0;
PyObject * _argo3 = 0;
wxPoint temp;
PyObject * _obj4 = 0;
char *_kwnames[] = { "parent","id","title","bitmap","pos", NULL };
char *_kwnames[] = { "parent","id","title","bitmap","pos","style", NULL };
char _ptemp[128];
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOO:new_wxWizard",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_obj4))
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iOOOl:new_wxWizard",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_obj4,&_arg5))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
@@ -1687,7 +1688,7 @@ static PyObject *_wrap_new_wxWizard(PyObject *self, PyObject *args, PyObject *kw
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxWizard *)new_wxWizard(_arg0,_arg1,*_arg2,*_arg3,*_arg4);
_result = (wxWizard *)new_wxWizard(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
@@ -1994,6 +1995,63 @@ static PyObject *_wrap_wxWizard_FitToPage(PyObject *self, PyObject *args, PyObje
return _resultobj;
}
#define wxWizard_GetPageAreaSizer(_swigobj) (_swigobj->GetPageAreaSizer())
static PyObject *_wrap_wxWizard_GetPageAreaSizer(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxSizer * _result;
wxWizard * _arg0;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxWizard_GetPageAreaSizer",_kwnames,&_argo0))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizard_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizard_GetPageAreaSizer. Expected _wxWizard_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
_result = (wxSizer *)wxWizard_GetPageAreaSizer(_arg0);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
}{ _resultobj = wxPyMake_wxSizer(_result); }
return _resultobj;
}
#define wxWizard_SetBorder(_swigobj,_swigarg0) (_swigobj->SetBorder(_swigarg0))
static PyObject *_wrap_wxWizard_SetBorder(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
wxWizard * _arg0;
int _arg1;
PyObject * _argo0 = 0;
char *_kwnames[] = { "self","border", NULL };
self = self;
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxWizard_SetBorder",_kwnames,&_argo0,&_arg1))
return NULL;
if (_argo0) {
if (_argo0 == Py_None) { _arg0 = NULL; }
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxWizard_p")) {
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWizard_SetBorder. Expected _wxWizard_p.");
return NULL;
}
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
wxWizard_SetBorder(_arg0,_arg1);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) return NULL;
} Py_INCREF(Py_None);
_resultobj = Py_None;
return _resultobj;
}
#define wxWizard_IsRunning(_swigobj) (_swigobj->IsRunning())
static PyObject *_wrap_wxWizard_IsRunning(PyObject *self, PyObject *args, PyObject *kwargs) {
PyObject * _resultobj;
@@ -2141,6 +2199,8 @@ static PyMethodDef wizardcMethods[] = {
{ "wxWizard_HasNextPage", (PyCFunction) _wrap_wxWizard_HasNextPage, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_ShowPage", (PyCFunction) _wrap_wxWizard_ShowPage, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_IsRunning", (PyCFunction) _wrap_wxWizard_IsRunning, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_SetBorder", (PyCFunction) _wrap_wxWizard_SetBorder, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_GetPageAreaSizer", (PyCFunction) _wrap_wxWizard_GetPageAreaSizer, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_FitToPage", (PyCFunction) _wrap_wxWizard_FitToPage, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_GetPageSize", (PyCFunction) _wrap_wxWizard_GetPageSize, METH_VARARGS | METH_KEYWORDS },
{ "wxWizard_SetPageSize", (PyCFunction) _wrap_wxWizard_SetPageSize, METH_VARARGS | METH_KEYWORDS },
wxPython/src/gtk/wizard.py
+6
View File
@@ -223,6 +223,12 @@ class wxWizardPtr(wxDialogPtr):
def FitToPage(self, *_args, **_kwargs):
val = wizardc.wxWizard_FitToPage(self, *_args, **_kwargs)
return val
def GetPageAreaSizer(self, *_args, **_kwargs):
val = wizardc.wxWizard_GetPageAreaSizer(self, *_args, **_kwargs)
return val
def SetBorder(self, *_args, **_kwargs):
val = wizardc.wxWizard_SetBorder(self, *_args, **_kwargs)
return val
def IsRunning(self, *_args, **_kwargs):
val = wizardc.wxWizard_IsRunning(self, *_args, **_kwargs)
return val
wxPython/src/gtk/wx.cpp
+38 -45
View File
@@ -83,6 +83,18 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) {
return target;
}
#if ! wxUSE_HOTKEY
enum wxHotkeyModifier
{
wxMOD_NONE = 0,
wxMOD_ALT = 1,
wxMOD_CONTROL = 2,
wxMOD_SHIFT = 4,
wxMOD_WIN = 8
};
#define wxEVT_HOTKEY 9999
#endif
#include <ctype.h>
@@ -2252,15 +2264,6 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxCLIP_SIBLINGS", PyInt_FromLong((long) wxCLIP_SIBLINGS));
PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED));
PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE));
PyDict_SetItemString(d,"wxTB_HORIZONTAL", PyInt_FromLong((long) wxTB_HORIZONTAL));
PyDict_SetItemString(d,"wxTB_VERTICAL", PyInt_FromLong((long) wxTB_VERTICAL));
PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS));
PyDict_SetItemString(d,"wxTB_FLAT", PyInt_FromLong((long) wxTB_FLAT));
PyDict_SetItemString(d,"wxTB_DOCKABLE", PyInt_FromLong((long) wxTB_DOCKABLE));
PyDict_SetItemString(d,"wxTB_NOICONS", PyInt_FromLong((long) wxTB_NOICONS));
PyDict_SetItemString(d,"wxTB_TEXT", PyInt_FromLong((long) wxTB_TEXT));
PyDict_SetItemString(d,"wxTB_NODIVIDER", PyInt_FromLong((long) wxTB_NODIVIDER));
PyDict_SetItemString(d,"wxTB_NOALIGN", PyInt_FromLong((long) wxTB_NOALIGN));
PyDict_SetItemString(d,"wxCOLOURED", PyInt_FromLong((long) wxCOLOURED));
PyDict_SetItemString(d,"wxFIXED_LENGTH", PyInt_FromLong((long) wxFIXED_LENGTH));
PyDict_SetItemString(d,"wxALIGN_LEFT", PyInt_FromLong((long) wxALIGN_LEFT));
@@ -2285,24 +2288,6 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxLB_HSCROLL", PyInt_FromLong((long) wxLB_HSCROLL));
PyDict_SetItemString(d,"wxPROCESS_ENTER", PyInt_FromLong((long) wxPROCESS_ENTER));
PyDict_SetItemString(d,"wxPASSWORD", PyInt_FromLong((long) wxPASSWORD));
PyDict_SetItemString(d,"wxTE_READONLY", PyInt_FromLong((long) wxTE_READONLY));
PyDict_SetItemString(d,"wxTE_MULTILINE", PyInt_FromLong((long) wxTE_MULTILINE));
PyDict_SetItemString(d,"wxTE_PROCESS_TAB", PyInt_FromLong((long) wxTE_PROCESS_TAB));
PyDict_SetItemString(d,"wxTE_RICH", PyInt_FromLong((long) wxTE_RICH));
PyDict_SetItemString(d,"wxTE_RICH2", PyInt_FromLong((long) wxTE_RICH2));
PyDict_SetItemString(d,"wxTE_NO_VSCROLL", PyInt_FromLong((long) wxTE_NO_VSCROLL));
PyDict_SetItemString(d,"wxTE_AUTO_SCROLL", PyInt_FromLong((long) wxTE_AUTO_SCROLL));
PyDict_SetItemString(d,"wxTE_PROCESS_ENTER", PyInt_FromLong((long) wxTE_PROCESS_ENTER));
PyDict_SetItemString(d,"wxTE_PASSWORD", PyInt_FromLong((long) wxTE_PASSWORD));
PyDict_SetItemString(d,"wxTE_AUTO_URL", PyInt_FromLong((long) wxTE_AUTO_URL));
PyDict_SetItemString(d,"wxTE_NOHIDESEL", PyInt_FromLong((long) wxTE_NOHIDESEL));
PyDict_SetItemString(d,"wxTE_DONTWRAP", PyInt_FromLong((long) wxTE_DONTWRAP));
PyDict_SetItemString(d,"wxTE_LINEWRAP", PyInt_FromLong((long) wxTE_LINEWRAP));
PyDict_SetItemString(d,"wxTE_WORDWRAP", PyInt_FromLong((long) wxTE_WORDWRAP));
PyDict_SetItemString(d,"wxTE_LEFT", PyInt_FromLong((long) wxTE_LEFT));
PyDict_SetItemString(d,"wxTE_RIGHT", PyInt_FromLong((long) wxTE_RIGHT));
PyDict_SetItemString(d,"wxTE_CENTER", PyInt_FromLong((long) wxTE_CENTER));
PyDict_SetItemString(d,"wxTE_CENTRE", PyInt_FromLong((long) wxTE_CENTRE));
PyDict_SetItemString(d,"wxCB_SIMPLE", PyInt_FromLong((long) wxCB_SIMPLE));
PyDict_SetItemString(d,"wxCB_DROPDOWN", PyInt_FromLong((long) wxCB_DROPDOWN));
PyDict_SetItemString(d,"wxCB_SORT", PyInt_FromLong((long) wxCB_SORT));
@@ -2338,18 +2323,6 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxBU_RIGHT", PyInt_FromLong((long) wxBU_RIGHT));
PyDict_SetItemString(d,"wxBU_BOTTOM", PyInt_FromLong((long) wxBU_BOTTOM));
PyDict_SetItemString(d,"wxBU_EXACTFIT", PyInt_FromLong((long) wxBU_EXACTFIT));
PyDict_SetItemString(d,"wxSP_VERTICAL", PyInt_FromLong((long) wxSP_VERTICAL));
PyDict_SetItemString(d,"wxSP_HORIZONTAL", PyInt_FromLong((long) wxSP_HORIZONTAL));
PyDict_SetItemString(d,"wxSP_ARROW_KEYS", PyInt_FromLong((long) wxSP_ARROW_KEYS));
PyDict_SetItemString(d,"wxSP_WRAP", PyInt_FromLong((long) wxSP_WRAP));
PyDict_SetItemString(d,"wxSP_NOBORDER", PyInt_FromLong((long) wxSP_NOBORDER));
PyDict_SetItemString(d,"wxSP_3D", PyInt_FromLong((long) wxSP_3D));
PyDict_SetItemString(d,"wxSP_3DSASH", PyInt_FromLong((long) wxSP_3DSASH));
PyDict_SetItemString(d,"wxSP_3DBORDER", PyInt_FromLong((long) wxSP_3DBORDER));
PyDict_SetItemString(d,"wxSP_FULLSASH", PyInt_FromLong((long) wxSP_FULLSASH));
PyDict_SetItemString(d,"wxSP_BORDER", PyInt_FromLong((long) wxSP_BORDER));
PyDict_SetItemString(d,"wxSP_LIVE_UPDATE", PyInt_FromLong((long) wxSP_LIVE_UPDATE));
PyDict_SetItemString(d,"wxSP_PERMIT_UNSPLIT", PyInt_FromLong((long) wxSP_PERMIT_UNSPLIT));
PyDict_SetItemString(d,"wxFLOOD_SURFACE", PyInt_FromLong((long) wxFLOOD_SURFACE));
PyDict_SetItemString(d,"wxFLOOD_BORDER", PyInt_FromLong((long) wxFLOOD_BORDER));
PyDict_SetItemString(d,"wxODDEVEN_RULE", PyInt_FromLong((long) wxODDEVEN_RULE));
@@ -2421,6 +2394,18 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxID_FIND", PyInt_FromLong((long) wxID_FIND));
PyDict_SetItemString(d,"wxID_DUPLICATE", PyInt_FromLong((long) wxID_DUPLICATE));
PyDict_SetItemString(d,"wxID_SELECTALL", PyInt_FromLong((long) wxID_SELECTALL));
PyDict_SetItemString(d,"wxID_DELETE", PyInt_FromLong((long) wxID_DELETE));
PyDict_SetItemString(d,"wxID_REPLACE", PyInt_FromLong((long) wxID_REPLACE));
PyDict_SetItemString(d,"wxID_REPLACE_ALL", PyInt_FromLong((long) wxID_REPLACE_ALL));
PyDict_SetItemString(d,"wxID_PROPERTIES", PyInt_FromLong((long) wxID_PROPERTIES));
PyDict_SetItemString(d,"wxID_VIEW_DETAILS", PyInt_FromLong((long) wxID_VIEW_DETAILS));
PyDict_SetItemString(d,"wxID_VIEW_LARGEICONS", PyInt_FromLong((long) wxID_VIEW_LARGEICONS));
PyDict_SetItemString(d,"wxID_VIEW_SMALLICONS", PyInt_FromLong((long) wxID_VIEW_SMALLICONS));
PyDict_SetItemString(d,"wxID_VIEW_LIST", PyInt_FromLong((long) wxID_VIEW_LIST));
PyDict_SetItemString(d,"wxID_VIEW_SORTDATE", PyInt_FromLong((long) wxID_VIEW_SORTDATE));
PyDict_SetItemString(d,"wxID_VIEW_SORTNAME", PyInt_FromLong((long) wxID_VIEW_SORTNAME));
PyDict_SetItemString(d,"wxID_VIEW_SORTSIZE", PyInt_FromLong((long) wxID_VIEW_SORTSIZE));
PyDict_SetItemString(d,"wxID_VIEW_SORTTYPE", PyInt_FromLong((long) wxID_VIEW_SORTTYPE));
PyDict_SetItemString(d,"wxID_FILE1", PyInt_FromLong((long) wxID_FILE1));
PyDict_SetItemString(d,"wxID_FILE2", PyInt_FromLong((long) wxID_FILE2));
PyDict_SetItemString(d,"wxID_FILE3", PyInt_FromLong((long) wxID_FILE3));
@@ -2485,12 +2470,6 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxSHRINK", PyInt_FromLong((long) wxSHRINK));
PyDict_SetItemString(d,"wxGROW", PyInt_FromLong((long) wxGROW));
PyDict_SetItemString(d,"wxEXPAND", PyInt_FromLong((long) wxEXPAND));
PyDict_SetItemString(d,"wxNB_FIXEDWIDTH", PyInt_FromLong((long) wxNB_FIXEDWIDTH));
PyDict_SetItemString(d,"wxNB_TOP", PyInt_FromLong((long) wxNB_TOP));
PyDict_SetItemString(d,"wxNB_LEFT", PyInt_FromLong((long) wxNB_LEFT));
PyDict_SetItemString(d,"wxNB_RIGHT", PyInt_FromLong((long) wxNB_RIGHT));
PyDict_SetItemString(d,"wxNB_BOTTOM", PyInt_FromLong((long) wxNB_BOTTOM));
PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE));
PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL));
PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL));
PyDict_SetItemString(d,"wxJOYSTICK1", PyInt_FromLong((long) wxJOYSTICK1));
@@ -2503,6 +2482,9 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxWS_EX_VALIDATE_RECURSIVELY", PyInt_FromLong((long) wxWS_EX_VALIDATE_RECURSIVELY));
PyDict_SetItemString(d,"wxWS_EX_BLOCK_EVENTS", PyInt_FromLong((long) wxWS_EX_BLOCK_EVENTS));
PyDict_SetItemString(d,"wxWS_EX_TRANSIENT", PyInt_FromLong((long) wxWS_EX_TRANSIENT));
PyDict_SetItemString(d,"wxWS_EX_THEMED_BACKGROUND", PyInt_FromLong((long) wxWS_EX_THEMED_BACKGROUND));
PyDict_SetItemString(d,"wxWS_EX_PROCESS_IDLE", PyInt_FromLong((long) wxWS_EX_PROCESS_IDLE));
PyDict_SetItemString(d,"wxWS_EX_PROCESS_UI_UPDATES", PyInt_FromLong((long) wxWS_EX_PROCESS_UI_UPDATES));
PyDict_SetItemString(d,"wxMM_TEXT", PyInt_FromLong((long) wxMM_TEXT));
PyDict_SetItemString(d,"wxMM_LOMETRIC", PyInt_FromLong((long) wxMM_LOMETRIC));
PyDict_SetItemString(d,"wxMM_HIMETRIC", PyInt_FromLong((long) wxMM_HIMETRIC));
@@ -2838,6 +2820,14 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxHT_WINDOW_HORZ_SCROLLBAR", PyInt_FromLong((long) wxHT_WINDOW_HORZ_SCROLLBAR));
PyDict_SetItemString(d,"wxHT_WINDOW_CORNER", PyInt_FromLong((long) wxHT_WINDOW_CORNER));
PyDict_SetItemString(d,"wxHT_MAX", PyInt_FromLong((long) wxHT_MAX));
PyDict_SetItemString(d,"wxMOD_NONE", PyInt_FromLong((long) wxMOD_NONE));
PyDict_SetItemString(d,"wxMOD_ALT", PyInt_FromLong((long) wxMOD_ALT));
PyDict_SetItemString(d,"wxMOD_CONTROL", PyInt_FromLong((long) wxMOD_CONTROL));
PyDict_SetItemString(d,"wxMOD_SHIFT", PyInt_FromLong((long) wxMOD_SHIFT));
PyDict_SetItemString(d,"wxMOD_WIN", PyInt_FromLong((long) wxMOD_WIN));
PyDict_SetItemString(d,"wxUPDATE_UI_NONE", PyInt_FromLong((long) wxUPDATE_UI_NONE));
PyDict_SetItemString(d,"wxUPDATE_UI_RECURSE", PyInt_FromLong((long) wxUPDATE_UI_RECURSE));
PyDict_SetItemString(d,"wxUPDATE_UI_FROMIDLE", PyInt_FromLong((long) wxUPDATE_UI_FROMIDLE));
PyDict_SetItemString(d,"wxEVT_NULL", PyInt_FromLong((long) wxEVT_NULL));
PyDict_SetItemString(d,"wxEVT_FIRST", PyInt_FromLong((long) wxEVT_FIRST));
PyDict_SetItemString(d,"wxEVT_COMMAND_BUTTON_CLICKED", PyInt_FromLong((long) wxEVT_COMMAND_BUTTON_CLICKED));
@@ -2895,6 +2885,7 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxEVT_KEY_DOWN", PyInt_FromLong((long) wxEVT_KEY_DOWN));
PyDict_SetItemString(d,"wxEVT_KEY_UP", PyInt_FromLong((long) wxEVT_KEY_UP));
PyDict_SetItemString(d,"wxEVT_CHAR_HOOK", PyInt_FromLong((long) wxEVT_CHAR_HOOK));
PyDict_SetItemString(d,"wxEVT_HOTKEY", PyInt_FromLong((long) wxEVT_HOTKEY));
PyDict_SetItemString(d,"wxEVT_SCROLL_TOP", PyInt_FromLong((long) wxEVT_SCROLL_TOP));
PyDict_SetItemString(d,"wxEVT_SCROLL_BOTTOM", PyInt_FromLong((long) wxEVT_SCROLL_BOTTOM));
PyDict_SetItemString(d,"wxEVT_SCROLL_LINEUP", PyInt_FromLong((long) wxEVT_SCROLL_LINEUP));
@@ -2914,6 +2905,8 @@ SWIGEXPORT(void) initwxc() {
PyDict_SetItemString(d,"wxEVT_SCROLLWIN_THUMBRELEASE", PyInt_FromLong((long) wxEVT_SCROLLWIN_THUMBRELEASE));
PyDict_SetItemString(d,"wxEVT_SIZE", PyInt_FromLong((long) wxEVT_SIZE));
PyDict_SetItemString(d,"wxEVT_MOVE", PyInt_FromLong((long) wxEVT_MOVE));
PyDict_SetItemString(d,"wxEVT_SIZING", PyInt_FromLong((long) wxEVT_SIZING));
PyDict_SetItemString(d,"wxEVT_MOVING", PyInt_FromLong((long) wxEVT_MOVING));
PyDict_SetItemString(d,"wxEVT_CLOSE_WINDOW", PyInt_FromLong((long) wxEVT_CLOSE_WINDOW));
PyDict_SetItemString(d,"wxEVT_END_SESSION", PyInt_FromLong((long) wxEVT_END_SESSION));
PyDict_SetItemString(d,"wxEVT_QUERY_END_SESSION", PyInt_FromLong((long) wxEVT_QUERY_END_SESSION));
wxPython/src/gtk/wx.py
+44 -68
View File
@@ -250,15 +250,6 @@ wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN
wxCLIP_SIBLINGS = wxc.wxCLIP_SIBLINGS
wxRETAINED = wxc.wxRETAINED
wxBACKINGSTORE = wxc.wxBACKINGSTORE
wxTB_HORIZONTAL = wxc.wxTB_HORIZONTAL
wxTB_VERTICAL = wxc.wxTB_VERTICAL
wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS
wxTB_FLAT = wxc.wxTB_FLAT
wxTB_DOCKABLE = wxc.wxTB_DOCKABLE
wxTB_NOICONS = wxc.wxTB_NOICONS
wxTB_TEXT = wxc.wxTB_TEXT
wxTB_NODIVIDER = wxc.wxTB_NODIVIDER
wxTB_NOALIGN = wxc.wxTB_NOALIGN
wxCOLOURED = wxc.wxCOLOURED
wxFIXED_LENGTH = wxc.wxFIXED_LENGTH
wxALIGN_LEFT = wxc.wxALIGN_LEFT
@@ -283,24 +274,6 @@ wxLB_OWNERDRAW = wxc.wxLB_OWNERDRAW
wxLB_HSCROLL = wxc.wxLB_HSCROLL
wxPROCESS_ENTER = wxc.wxPROCESS_ENTER
wxPASSWORD = wxc.wxPASSWORD
wxTE_READONLY = wxc.wxTE_READONLY
wxTE_MULTILINE = wxc.wxTE_MULTILINE
wxTE_PROCESS_TAB = wxc.wxTE_PROCESS_TAB
wxTE_RICH = wxc.wxTE_RICH
wxTE_RICH2 = wxc.wxTE_RICH2
wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
wxTE_PROCESS_ENTER = wxc.wxTE_PROCESS_ENTER
wxTE_PASSWORD = wxc.wxTE_PASSWORD
wxTE_AUTO_URL = wxc.wxTE_AUTO_URL
wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL
wxTE_DONTWRAP = wxc.wxTE_DONTWRAP
wxTE_LINEWRAP = wxc.wxTE_LINEWRAP
wxTE_WORDWRAP = wxc.wxTE_WORDWRAP
wxTE_LEFT = wxc.wxTE_LEFT
wxTE_RIGHT = wxc.wxTE_RIGHT
wxTE_CENTER = wxc.wxTE_CENTER
wxTE_CENTRE = wxc.wxTE_CENTRE
wxCB_SIMPLE = wxc.wxCB_SIMPLE
wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
wxCB_SORT = wxc.wxCB_SORT
@@ -336,18 +309,6 @@ wxBU_TOP = wxc.wxBU_TOP
wxBU_RIGHT = wxc.wxBU_RIGHT
wxBU_BOTTOM = wxc.wxBU_BOTTOM
wxBU_EXACTFIT = wxc.wxBU_EXACTFIT
wxSP_VERTICAL = wxc.wxSP_VERTICAL
wxSP_HORIZONTAL = wxc.wxSP_HORIZONTAL
wxSP_ARROW_KEYS = wxc.wxSP_ARROW_KEYS
wxSP_WRAP = wxc.wxSP_WRAP
wxSP_NOBORDER = wxc.wxSP_NOBORDER
wxSP_3D = wxc.wxSP_3D
wxSP_3DSASH = wxc.wxSP_3DSASH
wxSP_3DBORDER = wxc.wxSP_3DBORDER
wxSP_FULLSASH = wxc.wxSP_FULLSASH
wxSP_BORDER = wxc.wxSP_BORDER
wxSP_LIVE_UPDATE = wxc.wxSP_LIVE_UPDATE
wxSP_PERMIT_UNSPLIT = wxc.wxSP_PERMIT_UNSPLIT
wxFLOOD_SURFACE = wxc.wxFLOOD_SURFACE
wxFLOOD_BORDER = wxc.wxFLOOD_BORDER
wxODDEVEN_RULE = wxc.wxODDEVEN_RULE
@@ -419,6 +380,18 @@ wxID_CLEAR = wxc.wxID_CLEAR
wxID_FIND = wxc.wxID_FIND
wxID_DUPLICATE = wxc.wxID_DUPLICATE
wxID_SELECTALL = wxc.wxID_SELECTALL
wxID_DELETE = wxc.wxID_DELETE
wxID_REPLACE = wxc.wxID_REPLACE
wxID_REPLACE_ALL = wxc.wxID_REPLACE_ALL
wxID_PROPERTIES = wxc.wxID_PROPERTIES
wxID_VIEW_DETAILS = wxc.wxID_VIEW_DETAILS
wxID_VIEW_LARGEICONS = wxc.wxID_VIEW_LARGEICONS
wxID_VIEW_SMALLICONS = wxc.wxID_VIEW_SMALLICONS
wxID_VIEW_LIST = wxc.wxID_VIEW_LIST
wxID_VIEW_SORTDATE = wxc.wxID_VIEW_SORTDATE
wxID_VIEW_SORTNAME = wxc.wxID_VIEW_SORTNAME
wxID_VIEW_SORTSIZE = wxc.wxID_VIEW_SORTSIZE
wxID_VIEW_SORTTYPE = wxc.wxID_VIEW_SORTTYPE
wxID_FILE1 = wxc.wxID_FILE1
wxID_FILE2 = wxc.wxID_FILE2
wxID_FILE3 = wxc.wxID_FILE3
@@ -483,12 +456,6 @@ wxSTRETCH_NOT = wxc.wxSTRETCH_NOT
wxSHRINK = wxc.wxSHRINK
wxGROW = wxc.wxGROW
wxEXPAND = wxc.wxEXPAND
wxNB_FIXEDWIDTH = wxc.wxNB_FIXEDWIDTH
wxNB_TOP = wxc.wxNB_TOP
wxNB_LEFT = wxc.wxNB_LEFT
wxNB_RIGHT = wxc.wxNB_RIGHT
wxNB_BOTTOM = wxc.wxNB_BOTTOM
wxNB_MULTILINE = wxc.wxNB_MULTILINE
wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL
wxLI_VERTICAL = wxc.wxLI_VERTICAL
wxJOYSTICK1 = wxc.wxJOYSTICK1
@@ -501,6 +468,9 @@ wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY
wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
wxWS_EX_BLOCK_EVENTS = wxc.wxWS_EX_BLOCK_EVENTS
wxWS_EX_TRANSIENT = wxc.wxWS_EX_TRANSIENT
wxWS_EX_THEMED_BACKGROUND = wxc.wxWS_EX_THEMED_BACKGROUND
wxWS_EX_PROCESS_IDLE = wxc.wxWS_EX_PROCESS_IDLE
wxWS_EX_PROCESS_UI_UPDATES = wxc.wxWS_EX_PROCESS_UI_UPDATES
wxMM_TEXT = wxc.wxMM_TEXT
wxMM_LOMETRIC = wxc.wxMM_LOMETRIC
wxMM_HIMETRIC = wxc.wxMM_HIMETRIC
@@ -836,6 +806,14 @@ wxHT_WINDOW_VERT_SCROLLBAR = wxc.wxHT_WINDOW_VERT_SCROLLBAR
wxHT_WINDOW_HORZ_SCROLLBAR = wxc.wxHT_WINDOW_HORZ_SCROLLBAR
wxHT_WINDOW_CORNER = wxc.wxHT_WINDOW_CORNER
wxHT_MAX = wxc.wxHT_MAX
wxMOD_NONE = wxc.wxMOD_NONE
wxMOD_ALT = wxc.wxMOD_ALT
wxMOD_CONTROL = wxc.wxMOD_CONTROL
wxMOD_SHIFT = wxc.wxMOD_SHIFT
wxMOD_WIN = wxc.wxMOD_WIN
wxUPDATE_UI_NONE = wxc.wxUPDATE_UI_NONE
wxUPDATE_UI_RECURSE = wxc.wxUPDATE_UI_RECURSE
wxUPDATE_UI_FROMIDLE = wxc.wxUPDATE_UI_FROMIDLE
wxEVT_NULL = wxc.wxEVT_NULL
wxEVT_FIRST = wxc.wxEVT_FIRST
wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED
@@ -893,6 +871,7 @@ 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_HOTKEY = wxc.wxEVT_HOTKEY
wxEVT_SCROLL_TOP = wxc.wxEVT_SCROLL_TOP
wxEVT_SCROLL_BOTTOM = wxc.wxEVT_SCROLL_BOTTOM
wxEVT_SCROLL_LINEUP = wxc.wxEVT_SCROLL_LINEUP
@@ -912,6 +891,8 @@ wxEVT_SCROLLWIN_THUMBTRACK = wxc.wxEVT_SCROLLWIN_THUMBTRACK
wxEVT_SCROLLWIN_THUMBRELEASE = wxc.wxEVT_SCROLLWIN_THUMBRELEASE
wxEVT_SIZE = wxc.wxEVT_SIZE
wxEVT_MOVE = wxc.wxEVT_MOVE
wxEVT_SIZING = wxc.wxEVT_SIZING
wxEVT_MOVING = wxc.wxEVT_MOVING
wxEVT_CLOSE_WINDOW = wxc.wxEVT_CLOSE_WINDOW
wxEVT_END_SESSION = wxc.wxEVT_END_SESSION
wxEVT_QUERY_END_SESSION = wxc.wxEVT_QUERY_END_SESSION
@@ -1010,6 +991,12 @@ def EVT_SIZE(win, func):
def EVT_MOVE(win, func):
win.Connect(-1, -1, wxEVT_MOVE, func)
def EVT_SIZING(win, func):
win.Connect(-1, -1, wxEVT_SIZING, func)
def EVT_MOVING(win, func):
win.Connect(-1, -1, wxEVT_MOVING, func)
def EVT_CLOSE(win, func):
win.Connect(-1, -1, wxEVT_CLOSE_WINDOW, func)
@@ -1031,6 +1018,9 @@ def EVT_KEY_DOWN(win, func):
def EVT_KEY_UP(win, func):
win.Connect(-1, -1, wxEVT_KEY_UP, func)
def EVT_HOTKEY(win, func):
win.Connect(-1, -1, wxEVT_HOTKEY, func)
def EVT_MENU_OPEN(win, func):
win.Connect(-1, -1, wxEVT_MENU_OPEN, func)
@@ -1455,29 +1445,6 @@ def EVT_SPIN(win, id, func):
win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func)
# wxTaskBarIcon
def EVT_TASKBAR_MOVE(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func)
def EVT_TASKBAR_LEFT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func)
def EVT_TASKBAR_LEFT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func)
def EVT_TASKBAR_RIGHT_DOWN(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func)
def EVT_TASKBAR_RIGHT_UP(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func)
def EVT_TASKBAR_LEFT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func)
def EVT_TASKBAR_RIGHT_DCLICK(win, func):
win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func)
# wxSashWindow
def EVT_SASH_DRAGGED(win, id, func):
win.Connect(id, -1, wxEVT_SASH_DRAGGED, func)
@@ -1939,6 +1906,15 @@ of your Mac."""
if redirect:
self.RedirectStdio(filename)
# Set the default handler for SIGINT. This fixes a problem
# where if Ctrl-C is pressed in the console that started this
# app then it will not appear to do anything, (not even send
# KeyboardInterrupt???) but will later segfault on exit. By
# setting the default handler then the app will exit, as
# expected (depending on platform.)
import signal
signal.signal(signal.SIGINT, signal.SIG_DFL)
# this initializes wxWindows and then calls our OnInit
_wxStart(self.OnInit)

Some files were not shown because too many files have changed in this diff Show More