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

reSWIGged

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2004-11-19 22:59:49 +00:00
parent 9f486b326a
commit 8fb0e70a5d
27 changed files with 449 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wxPython/src/gtk/_controls.py
View File

@ -11,6 +11,7 @@ BU_LEFT = _controls_.BU_LEFT
BU_TOP = _controls_.BU_TOP
BU_RIGHT = _controls_.BU_RIGHT
BU_BOTTOM = _controls_.BU_BOTTOM
BU_ALIGN_MASK = _controls_.BU_ALIGN_MASK
BU_EXACTFIT = _controls_.BU_EXACTFIT
BU_AUTODRAW = _controls_.BU_AUTODRAW
class Button(_core.Control):
@ -2791,6 +2792,10 @@ class BookCtrl(_core.Control):
"""GetPage(self, size_t n) -> Window"""
return _controls_.BookCtrl_GetPage(*args, **kwargs)
def GetCurrentPage(*args, **kwargs):
"""GetCurrentPage(self) -> Window"""
return _controls_.BookCtrl_GetCurrentPage(*args, **kwargs)
def GetSelection(*args, **kwargs):
"""GetSelection(self) -> int"""
return _controls_.BookCtrl_GetSelection(*args, **kwargs)

30
wxPython/src/gtk/_controls_wrap.cpp
View File

@ -14308,6 +14308,34 @@ static PyObject *_wrap_BookCtrl_GetPage(PyObject *, PyObject *args, PyObject *kw
}
static PyObject *_wrap_BookCtrl_GetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
wxWindow *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrl_GetCurrentPage",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxWindow *)((wxBookCtrl const *)arg1)->GetCurrentPage();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_BookCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
@ -32000,6 +32028,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ToggleButton_swigregister", ToggleButton_swigregister, METH_VARARGS, NULL },
{ (char *)"BookCtrl_GetPageCount", (PyCFunction) _wrap_BookCtrl_GetPageCount, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetPage", (PyCFunction) _wrap_BookCtrl_GetPage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetCurrentPage", (PyCFunction) _wrap_BookCtrl_GetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetSelection", (PyCFunction) _wrap_BookCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_SetPageText", (PyCFunction) _wrap_BookCtrl_SetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetPageText", (PyCFunction) _wrap_BookCtrl_GetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
@ -33741,6 +33770,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"BU_TOP", SWIG_From_int((int)wxBU_TOP));
PyDict_SetItemString(d,"BU_RIGHT", SWIG_From_int((int)wxBU_RIGHT));
PyDict_SetItemString(d,"BU_BOTTOM", SWIG_From_int((int)wxBU_BOTTOM));
PyDict_SetItemString(d,"BU_ALIGN_MASK", SWIG_From_int((int)wxBU_ALIGN_MASK));
PyDict_SetItemString(d,"BU_EXACTFIT", SWIG_From_int((int)wxBU_EXACTFIT));
PyDict_SetItemString(d,"BU_AUTODRAW", SWIG_From_int((int)wxBU_AUTODRAW));
SWIG_addvarlink(SWIG_globals,(char*)"CheckBoxNameStr",_wrap_CheckBoxNameStr_get, _wrap_CheckBoxNameStr_set);

23
wxPython/src/gtk/_core.py
View File

@ -1520,6 +1520,12 @@ class InputStream(object):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_core_.delete_InputStream):
"""__del__(self)"""
try:
if self.thisown: destroy(self)
except: pass
def close(*args, **kwargs):
"""close(self)"""
return _core_.InputStream_close(*args, **kwargs)
@ -2125,6 +2131,20 @@ class Image(Object):
"""
return _core_.Image_ConvertAlphaToMask(*args, **kwargs)
def ConvertColourToAlpha(*args, **kwargs):
"""
ConvertColourToAlpha(self, unsigned char r, unsigned char g, unsigned char b) -> bool
This method converts an image where the original alpha information is
only available as a shades of a colour (actually shades of grey)
typically when you draw anti-aliased text into a bitmap. The DC
drawing routines draw grey values on the black background although
they actually mean to draw white with differnt alpha values. This
method reverses it, assuming a black (!) background and white text.
The method will then fill up the whole image with the colour given.
"""
return _core_.Image_ConvertColourToAlpha(*args, **kwargs)
def SetMaskFromImage(*args, **kwargs):
"""SetMaskFromImage(self, Image mask, byte mr, byte mg, byte mb) -> bool"""
return _core_.Image_SetMaskFromImage(*args, **kwargs)
@ -5306,6 +5326,9 @@ your Mac."""
if redirect:
self.RedirectStdio(filename)
# Use Python's install prefix as the default
wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix)
# This finishes the initialization of wxWindows and then calls
# the OnInit that should be present in the derived class
self._BootstrapApp()

67
wxPython/src/gtk/_core_wrap.cpp
View File

@ -6005,6 +6005,31 @@ static PyObject *_wrap_new_InputStream(PyObject *, PyObject *args, PyObject *kwa
}
static PyObject *_wrap_delete_InputStream(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_InputStream",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_InputStream_close(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
@ -9768,6 +9793,46 @@ static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyOb
}
static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
unsigned char arg2 ;
unsigned char arg3 ;
unsigned char arg4 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertColourToAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1);
if (PyErr_Occurred()) SWIG_fail;
arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2);
if (PyErr_Occurred()) SWIG_fail;
arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3);
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->ConvertColourToAlpha(arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Image_SetMaskFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
@ -40912,6 +40977,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS, NULL },
{ (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"delete_InputStream", (PyCFunction) _wrap_delete_InputStream, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_flush", (PyCFunction) _wrap_InputStream_flush, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_eof", (PyCFunction) _wrap_InputStream_eof, METH_VARARGS | METH_KEYWORDS, NULL },
@ -41020,6 +41086,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_ConvertColourToAlpha", (PyCFunction) _wrap_Image_ConvertColourToAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL },

4
wxPython/src/gtk/_gdi.py
View File

@ -2347,8 +2347,8 @@ def EncodingConverter_CanConvert(*args, **kwargs):
# to the default catalog path.
if wx.Platform == "__WXMSW__":
import os
localedir = os.path.join(os.path.split(__file__)[0], "locale")
Locale_AddCatalogLookupPathPrefix(localedir)
_localedir = os.path.join(os.path.split(__file__)[0], "locale")
Locale.AddCatalogLookupPathPrefix(_localedir)
del os
#----------------------------------------------------------------------------

20
wxPython/src/gtk/_misc.py
View File

@ -5756,7 +5756,7 @@ class StandardPaths(object):
"""
Get() -> StandardPaths
Return the global standard paths object
Return the global standard paths singleton
"""
return _misc_.StandardPaths_Get(*args, **kwargs)
@ -5766,7 +5766,7 @@ class StandardPaths(object):
GetConfigDir(self) -> String
Return the directory with system config files: /etc under Unix,
c:\Documents and Settings\All Users\Application Data under Windows,
'c:\Documents and Settings\All Users\Application Data' under Windows,
/Library/Preferences for Mac
"""
return _misc_.StandardPaths_GetConfigDir(*args, **kwargs)
@ -5776,7 +5776,7 @@ class StandardPaths(object):
GetUserConfigDir(self) -> String
Return the directory for the user config files: $HOME under Unix,
c:\Documents and Settings\username under Windows,
'c:\Documents and Settings\username' under Windows, and
~/Library/Preferences under Mac
Only use this if you have a single file to put there, otherwise
@ -5790,7 +5790,7 @@ class StandardPaths(object):
Return the location of the application's global, (i.e. not
user-specific,) data files: prefix/share/appname under Unix,
c:\Program Filesppname under Windows,
'c:\Program Files\appname' under Windows,
appname.app/Contents/SharedSupport app bundle directory under Mac.
"""
return _misc_.StandardPaths_GetDataDir(*args, **kwargs)
@ -5811,7 +5811,7 @@ class StandardPaths(object):
Return the directory for the user-dependent application data files:
$HOME/.appname under Unix, c:\Documents and
Settings\username\Application Datappname under Windows and
Settings\username\Application Data\appname under Windows and
~/Library/Application Support/appname under Mac
"""
return _misc_.StandardPaths_GetUserDataDir(*args, **kwargs)
@ -5824,7 +5824,7 @@ class StandardPaths(object):
with the other machines
Same as `GetUserDataDir` for all platforms except Windows where it is
the 'Local Settings\Application Datappname' directory.
the 'Local Settings\Application Data\appname' directory.
"""
return _misc_.StandardPaths_GetUserLocalDataDir(*args, **kwargs)
@ -5844,7 +5844,8 @@ class StandardPaths(object):
Set the program installation directory which is /usr/local by default.
This value will be used by other methods such as `GetDataDir` and
`GetPluginsDir` as the prefix for what they return. (Unix only.)
`GetPluginsDir` as the prefix for what they return. (This function
only has meaning on Unix systems.)
"""
return _misc_.StandardPaths_SetInstallPrefix(*args, **kwargs)
@ -5852,7 +5853,8 @@ class StandardPaths(object):
"""
GetInstallPrefix(self) -> String
Get the program installation prefix. (Unix only.)
Get the program installation prefix. The default is the prefix where
Python is installed. (This function only has meaning on Unix systems.)
"""
return _misc_.StandardPaths_GetInstallPrefix(*args, **kwargs)
@ -5868,7 +5870,7 @@ def StandardPaths_Get(*args, **kwargs):
"""
StandardPaths_Get() -> StandardPaths
Return the global standard paths object
Return the global standard paths singleton
"""
return _misc_.StandardPaths_Get(*args, **kwargs)

8
wxPython/src/gtk/_misc_wrap.cpp
View File

@ -1772,6 +1772,9 @@ PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode){
#include <wx/stdpaths.h>
wxStandardPaths *StandardPaths_Get(){
return (wxStandardPaths*) &wxStandardPaths::Get();
}
#ifdef __cplusplus
extern "C" {
#endif
@ -28546,10 +28549,7 @@ static PyObject *_wrap_StandardPaths_Get(PyObject *, PyObject *args, PyObject *k
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":StandardPaths_Get",kwnames)) goto fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxStandardPaths &_result_ref = wxStandardPaths::Get();
result = (wxStandardPaths *) &_result_ref;
}
result = (wxStandardPaths *)StandardPaths_Get();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;

4
wxPython/src/gtk/html.py
View File

@ -1615,7 +1615,7 @@ HF_BOOKMARKS = _html.HF_BOOKMARKS
HF_OPENFILES = _html.HF_OPENFILES
HF_PRINT = _html.HF_PRINT
HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
class HtmlHelpController(_core.EvtHandler):
class HtmlHelpController(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@ -1624,8 +1624,6 @@ class HtmlHelpController(_core.EvtHandler):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._setOORInfo(self)
def __del__(self, destroy=_html.delete_HtmlHelpController):
"""__del__(self)"""
try:

27
wxPython/src/gtk/html_wrap.cpp
View File

File diff suppressed because one or more lines are too long

5
wxPython/src/mac/_controls.py
View File

@ -11,6 +11,7 @@ BU_LEFT = _controls_.BU_LEFT
BU_TOP = _controls_.BU_TOP
BU_RIGHT = _controls_.BU_RIGHT
BU_BOTTOM = _controls_.BU_BOTTOM
BU_ALIGN_MASK = _controls_.BU_ALIGN_MASK
BU_EXACTFIT = _controls_.BU_EXACTFIT
BU_AUTODRAW = _controls_.BU_AUTODRAW
class Button(_core.Control):
@ -2787,6 +2788,10 @@ class BookCtrl(_core.Control):
"""GetPage(self, size_t n) -> Window"""
return _controls_.BookCtrl_GetPage(*args, **kwargs)
def GetCurrentPage(*args, **kwargs):
"""GetCurrentPage(self) -> Window"""
return _controls_.BookCtrl_GetCurrentPage(*args, **kwargs)
def GetSelection(*args, **kwargs):
"""GetSelection(self) -> int"""
return _controls_.BookCtrl_GetSelection(*args, **kwargs)

30
wxPython/src/mac/_controls_wrap.cpp
View File

@ -14279,6 +14279,34 @@ static PyObject *_wrap_BookCtrl_GetPage(PyObject *, PyObject *args, PyObject *kw
}
static PyObject *_wrap_BookCtrl_GetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
wxWindow *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrl_GetCurrentPage",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxWindow *)((wxBookCtrl const *)arg1)->GetCurrentPage();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_BookCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
@ -31970,6 +31998,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ToggleButton_swigregister", ToggleButton_swigregister, METH_VARARGS, NULL },
{ (char *)"BookCtrl_GetPageCount", (PyCFunction) _wrap_BookCtrl_GetPageCount, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetPage", (PyCFunction) _wrap_BookCtrl_GetPage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetCurrentPage", (PyCFunction) _wrap_BookCtrl_GetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetSelection", (PyCFunction) _wrap_BookCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_SetPageText", (PyCFunction) _wrap_BookCtrl_SetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetPageText", (PyCFunction) _wrap_BookCtrl_GetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
@ -33711,6 +33740,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"BU_TOP", SWIG_From_int((int)wxBU_TOP));
PyDict_SetItemString(d,"BU_RIGHT", SWIG_From_int((int)wxBU_RIGHT));
PyDict_SetItemString(d,"BU_BOTTOM", SWIG_From_int((int)wxBU_BOTTOM));
PyDict_SetItemString(d,"BU_ALIGN_MASK", SWIG_From_int((int)wxBU_ALIGN_MASK));
PyDict_SetItemString(d,"BU_EXACTFIT", SWIG_From_int((int)wxBU_EXACTFIT));
PyDict_SetItemString(d,"BU_AUTODRAW", SWIG_From_int((int)wxBU_AUTODRAW));
SWIG_addvarlink(SWIG_globals,(char*)"CheckBoxNameStr",_wrap_CheckBoxNameStr_get, _wrap_CheckBoxNameStr_set);

23
wxPython/src/mac/_core.py
View File

@ -1520,6 +1520,12 @@ class InputStream(object):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_core_.delete_InputStream):
"""__del__(self)"""
try:
if self.thisown: destroy(self)
except: pass
def close(*args, **kwargs):
"""close(self)"""
return _core_.InputStream_close(*args, **kwargs)
@ -2125,6 +2131,20 @@ class Image(Object):
"""
return _core_.Image_ConvertAlphaToMask(*args, **kwargs)
def ConvertColourToAlpha(*args, **kwargs):
"""
ConvertColourToAlpha(self, unsigned char r, unsigned char g, unsigned char b) -> bool
This method converts an image where the original alpha information is
only available as a shades of a colour (actually shades of grey)
typically when you draw anti-aliased text into a bitmap. The DC
drawing routines draw grey values on the black background although
they actually mean to draw white with differnt alpha values. This
method reverses it, assuming a black (!) background and white text.
The method will then fill up the whole image with the colour given.
"""
return _core_.Image_ConvertColourToAlpha(*args, **kwargs)
def SetMaskFromImage(*args, **kwargs):
"""SetMaskFromImage(self, Image mask, byte mr, byte mg, byte mb) -> bool"""
return _core_.Image_SetMaskFromImage(*args, **kwargs)
@ -5306,6 +5326,9 @@ your Mac."""
if redirect:
self.RedirectStdio(filename)
# Use Python's install prefix as the default
wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix)
# This finishes the initialization of wxWindows and then calls
# the OnInit that should be present in the derived class
self._BootstrapApp()

67
wxPython/src/mac/_core_wrap.cpp
View File

@ -6005,6 +6005,31 @@ static PyObject *_wrap_new_InputStream(PyObject *, PyObject *args, PyObject *kwa
}
static PyObject *_wrap_delete_InputStream(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_InputStream",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_InputStream_close(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
@ -9768,6 +9793,46 @@ static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyOb
}
static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
unsigned char arg2 ;
unsigned char arg3 ;
unsigned char arg4 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertColourToAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1);
if (PyErr_Occurred()) SWIG_fail;
arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2);
if (PyErr_Occurred()) SWIG_fail;
arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3);
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->ConvertColourToAlpha(arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Image_SetMaskFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
@ -40912,6 +40977,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS, NULL },
{ (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"delete_InputStream", (PyCFunction) _wrap_delete_InputStream, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_flush", (PyCFunction) _wrap_InputStream_flush, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_eof", (PyCFunction) _wrap_InputStream_eof, METH_VARARGS | METH_KEYWORDS, NULL },
@ -41020,6 +41086,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_ConvertColourToAlpha", (PyCFunction) _wrap_Image_ConvertColourToAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL },

4
wxPython/src/mac/_gdi.py
View File

@ -2347,8 +2347,8 @@ def EncodingConverter_CanConvert(*args, **kwargs):
# to the default catalog path.
if wx.Platform == "__WXMSW__":
import os
localedir = os.path.join(os.path.split(__file__)[0], "locale")
Locale_AddCatalogLookupPathPrefix(localedir)
_localedir = os.path.join(os.path.split(__file__)[0], "locale")
Locale.AddCatalogLookupPathPrefix(_localedir)
del os
#----------------------------------------------------------------------------

30
wxPython/src/mac/_misc.py
View File

@ -5764,7 +5764,7 @@ class StandardPaths(object):
"""
Get() -> StandardPaths
Return the global standard paths object
Return the global standard paths singleton
"""
return _misc_.StandardPaths_Get(*args, **kwargs)
@ -5774,7 +5774,7 @@ class StandardPaths(object):
GetConfigDir(self) -> String
Return the directory with system config files: /etc under Unix,
c:\Documents and Settings\All Users\Application Data under Windows,
'c:\Documents and Settings\All Users\Application Data' under Windows,
/Library/Preferences for Mac
"""
return _misc_.StandardPaths_GetConfigDir(*args, **kwargs)
@ -5784,7 +5784,7 @@ class StandardPaths(object):
GetUserConfigDir(self) -> String
Return the directory for the user config files: $HOME under Unix,
c:\Documents and Settings\username under Windows,
'c:\Documents and Settings\username' under Windows, and
~/Library/Preferences under Mac
Only use this if you have a single file to put there, otherwise
@ -5798,7 +5798,7 @@ class StandardPaths(object):
Return the location of the application's global, (i.e. not
user-specific,) data files: prefix/share/appname under Unix,
c:\Program Filesppname under Windows,
'c:\Program Files\appname' under Windows,
appname.app/Contents/SharedSupport app bundle directory under Mac.
"""
return _misc_.StandardPaths_GetDataDir(*args, **kwargs)
@ -5819,7 +5819,7 @@ class StandardPaths(object):
Return the directory for the user-dependent application data files:
$HOME/.appname under Unix, c:\Documents and
Settings\username\Application Datappname under Windows and
Settings\username\Application Data\appname under Windows and
~/Library/Application Support/appname under Mac
"""
return _misc_.StandardPaths_GetUserDataDir(*args, **kwargs)
@ -5832,7 +5832,7 @@ class StandardPaths(object):
with the other machines
Same as `GetUserDataDir` for all platforms except Windows where it is
the 'Local Settings\Application Datappname' directory.
the 'Local Settings\Application Data\appname' directory.
"""
return _misc_.StandardPaths_GetUserLocalDataDir(*args, **kwargs)
@ -5847,11 +5847,23 @@ class StandardPaths(object):
return _misc_.StandardPaths_GetPluginsDir(*args, **kwargs)
def SetInstallPrefix(*args, **kwargs):
"""SetInstallPrefix(self, String prefix)"""
"""
SetInstallPrefix(self, String prefix)
Set the program installation directory which is /usr/local by default.
This value will be used by other methods such as `GetDataDir` and
`GetPluginsDir` as the prefix for what they return. (This function
only has meaning on Unix systems.)
"""
return _misc_.StandardPaths_SetInstallPrefix(*args, **kwargs)
def GetInstallPrefix(*args, **kwargs):
"""GetInstallPrefix(self) -> String"""
"""
GetInstallPrefix(self) -> String
Get the program installation prefix. The default is the prefix where
Python is installed. (This function only has meaning on Unix systems.)
"""
return _misc_.StandardPaths_GetInstallPrefix(*args, **kwargs)
@ -5866,7 +5878,7 @@ def StandardPaths_Get(*args, **kwargs):
"""
StandardPaths_Get() -> StandardPaths
Return the global standard paths object
Return the global standard paths singleton
"""
return _misc_.StandardPaths_Get(*args, **kwargs)

8
wxPython/src/mac/_misc_wrap.cpp
View File

@ -1763,6 +1763,9 @@ PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode){
#include <wx/stdpaths.h>
wxStandardPaths *StandardPaths_Get(){
return (wxStandardPaths*) &wxStandardPaths::Get();
}
void wxStandardPaths_SetInstallPrefix(wxStandardPaths *self,wxString const &prefix){}
wxString wxStandardPaths_GetInstallPrefix(wxStandardPaths *self){ return wxEmptyString; }
#ifdef __cplusplus
@ -28603,10 +28606,7 @@ static PyObject *_wrap_StandardPaths_Get(PyObject *, PyObject *args, PyObject *k
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":StandardPaths_Get",kwnames)) goto fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxStandardPaths &_result_ref = wxStandardPaths::Get();
result = (wxStandardPaths *) &_result_ref;
}
result = (wxStandardPaths *)StandardPaths_Get();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;

4
wxPython/src/mac/html.py
View File

@ -1615,7 +1615,7 @@ HF_BOOKMARKS = _html.HF_BOOKMARKS
HF_OPENFILES = _html.HF_OPENFILES
HF_PRINT = _html.HF_PRINT
HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
class HtmlHelpController(_core.EvtHandler):
class HtmlHelpController(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@ -1624,8 +1624,6 @@ class HtmlHelpController(_core.EvtHandler):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._setOORInfo(self)
def __del__(self, destroy=_html.delete_HtmlHelpController):
"""__del__(self)"""
try:

27
wxPython/src/mac/html_wrap.cpp
View File

File diff suppressed because one or more lines are too long

9
wxPython/src/msw/_controls.py
View File

@ -11,6 +11,7 @@ BU_LEFT = _controls_.BU_LEFT
BU_TOP = _controls_.BU_TOP
BU_RIGHT = _controls_.BU_RIGHT
BU_BOTTOM = _controls_.BU_BOTTOM
BU_ALIGN_MASK = _controls_.BU_ALIGN_MASK
BU_EXACTFIT = _controls_.BU_EXACTFIT
BU_AUTODRAW = _controls_.BU_AUTODRAW
class Button(_core.Control):
@ -2799,6 +2800,10 @@ class BookCtrl(_core.Control):
"""GetPage(self, size_t n) -> Window"""
return _controls_.BookCtrl_GetPage(*args, **kwargs)
def GetCurrentPage(*args, **kwargs):
"""GetCurrentPage(self) -> Window"""
return _controls_.BookCtrl_GetCurrentPage(*args, **kwargs)
def GetSelection(*args, **kwargs):
"""GetSelection(self) -> int"""
return _controls_.BookCtrl_GetSelection(*args, **kwargs)
@ -3008,10 +3013,6 @@ class Notebook(BookCtrl):
"""CalcSizeFromPage(self, Size sizePage) -> Size"""
return _controls_.Notebook_CalcSizeFromPage(*args, **kwargs)
def ApplyThemeBackground(*args, **kwargs):
"""ApplyThemeBackground(self, Window window, Colour colour)"""
return _controls_.Notebook_ApplyThemeBackground(*args, **kwargs)
def GetClassDefaultAttributes(*args, **kwargs):
"""
GetClassDefaultAttributes(int variant=WINDOW_VARIANT_NORMAL) -> VisualAttributes

67
wxPython/src/msw/_controls_wrap.cpp
View File

@ -14367,6 +14367,34 @@ static PyObject *_wrap_BookCtrl_GetPage(PyObject *, PyObject *args, PyObject *kw
}
static PyObject *_wrap_BookCtrl_GetCurrentPage(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
wxWindow *result;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:BookCtrl_GetCurrentPage",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxBookCtrl,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxWindow *)((wxBookCtrl const *)arg1)->GetCurrentPage();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = wxPyMake_wxObject(result, 0);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_BookCtrl_GetSelection(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxBookCtrl *arg1 = (wxBookCtrl *) 0 ;
@ -15528,42 +15556,6 @@ static PyObject *_wrap_Notebook_CalcSizeFromPage(PyObject *, PyObject *args, PyO
}
static PyObject *_wrap_Notebook_ApplyThemeBackground(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxNotebook *arg1 = (wxNotebook *) 0 ;
wxWindow *arg2 = (wxWindow *) 0 ;
wxColour *arg3 = 0 ;
wxColour temp3 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "window",(char *) "colour", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOO:Notebook_ApplyThemeBackground",kwnames,&obj0,&obj1,&obj2)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxNotebook,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
if ((SWIG_ConvertPtr(obj1,(void **)(&arg2),SWIGTYPE_p_wxWindow,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
arg3 = &temp3;
if ( ! wxColour_helper(obj2, &arg3)) SWIG_fail;
}
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
(arg1)->ApplyThemeBackground(arg2,(wxColour const &)*arg3);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Notebook_GetClassDefaultAttributes(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
int arg1 = (int) wxWINDOW_VARIANT_NORMAL ;
@ -32278,6 +32270,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"ToggleButton_swigregister", ToggleButton_swigregister, METH_VARARGS, NULL },
{ (char *)"BookCtrl_GetPageCount", (PyCFunction) _wrap_BookCtrl_GetPageCount, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetPage", (PyCFunction) _wrap_BookCtrl_GetPage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetCurrentPage", (PyCFunction) _wrap_BookCtrl_GetCurrentPage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetSelection", (PyCFunction) _wrap_BookCtrl_GetSelection, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_SetPageText", (PyCFunction) _wrap_BookCtrl_SetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"BookCtrl_GetPageText", (PyCFunction) _wrap_BookCtrl_GetPageText, METH_VARARGS | METH_KEYWORDS, NULL },
@ -32311,7 +32304,6 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Notebook_SetTabSize", (PyCFunction) _wrap_Notebook_SetTabSize, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Notebook_HitTest", (PyCFunction) _wrap_Notebook_HitTest, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Notebook_CalcSizeFromPage", (PyCFunction) _wrap_Notebook_CalcSizeFromPage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Notebook_ApplyThemeBackground", (PyCFunction) _wrap_Notebook_ApplyThemeBackground, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Notebook_GetClassDefaultAttributes", (PyCFunction) _wrap_Notebook_GetClassDefaultAttributes, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Notebook_swigregister", Notebook_swigregister, METH_VARARGS, NULL },
{ (char *)"new_NotebookEvent", (PyCFunction) _wrap_new_NotebookEvent, METH_VARARGS | METH_KEYWORDS, NULL },
@ -34031,6 +34023,7 @@ SWIGEXPORT(void) SWIG_init(void) {
PyDict_SetItemString(d,"BU_TOP", SWIG_From_int((int)wxBU_TOP));
PyDict_SetItemString(d,"BU_RIGHT", SWIG_From_int((int)wxBU_RIGHT));
PyDict_SetItemString(d,"BU_BOTTOM", SWIG_From_int((int)wxBU_BOTTOM));
PyDict_SetItemString(d,"BU_ALIGN_MASK", SWIG_From_int((int)wxBU_ALIGN_MASK));
PyDict_SetItemString(d,"BU_EXACTFIT", SWIG_From_int((int)wxBU_EXACTFIT));
PyDict_SetItemString(d,"BU_AUTODRAW", SWIG_From_int((int)wxBU_AUTODRAW));
SWIG_addvarlink(SWIG_globals,(char*)"CheckBoxNameStr",_wrap_CheckBoxNameStr_get, _wrap_CheckBoxNameStr_set);

23
wxPython/src/msw/_core.py
View File

@ -1520,6 +1520,12 @@ class InputStream(object):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
def __del__(self, destroy=_core_.delete_InputStream):
"""__del__(self)"""
try:
if self.thisown: destroy(self)
except: pass
def close(*args, **kwargs):
"""close(self)"""
return _core_.InputStream_close(*args, **kwargs)
@ -2125,6 +2131,20 @@ class Image(Object):
"""
return _core_.Image_ConvertAlphaToMask(*args, **kwargs)
def ConvertColourToAlpha(*args, **kwargs):
"""
ConvertColourToAlpha(self, unsigned char r, unsigned char g, unsigned char b) -> bool
This method converts an image where the original alpha information is
only available as a shades of a colour (actually shades of grey)
typically when you draw anti-aliased text into a bitmap. The DC
drawing routines draw grey values on the black background although
they actually mean to draw white with differnt alpha values. This
method reverses it, assuming a black (!) background and white text.
The method will then fill up the whole image with the colour given.
"""
return _core_.Image_ConvertColourToAlpha(*args, **kwargs)
def SetMaskFromImage(*args, **kwargs):
"""SetMaskFromImage(self, Image mask, byte mr, byte mg, byte mb) -> bool"""
return _core_.Image_SetMaskFromImage(*args, **kwargs)
@ -5306,6 +5326,9 @@ your Mac."""
if redirect:
self.RedirectStdio(filename)
# Use Python's install prefix as the default
wx.StandardPaths.Get().SetInstallPrefix(_sys.prefix)
# This finishes the initialization of wxWindows and then calls
# the OnInit that should be present in the derived class
self._BootstrapApp()

67
wxPython/src/msw/_core_wrap.cpp
View File

@ -6003,6 +6003,31 @@ static PyObject *_wrap_new_InputStream(PyObject *, PyObject *args, PyObject *kwa
}
static PyObject *_wrap_delete_InputStream(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
PyObject * obj0 = 0 ;
char *kwnames[] = {
(char *) "self", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O:delete_InputStream",kwnames,&obj0)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxPyInputStream,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
delete arg1;
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_InputStream_close(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxPyInputStream *arg1 = (wxPyInputStream *) 0 ;
@ -9766,6 +9791,46 @@ static PyObject *_wrap_Image_ConvertAlphaToMask(PyObject *, PyObject *args, PyOb
}
static PyObject *_wrap_Image_ConvertColourToAlpha(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
unsigned char arg2 ;
unsigned char arg3 ;
unsigned char arg4 ;
bool result;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
PyObject * obj3 = 0 ;
char *kwnames[] = {
(char *) "self",(char *) "r",(char *) "g",(char *) "b", NULL
};
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OOOO:Image_ConvertColourToAlpha",kwnames,&obj0,&obj1,&obj2,&obj3)) goto fail;
if ((SWIG_ConvertPtr(obj0,(void **)(&arg1),SWIGTYPE_p_wxImage,
SWIG_POINTER_EXCEPTION | 0)) == -1) SWIG_fail;
arg2 = (unsigned char)SWIG_As_unsigned_SS_char(obj1);
if (PyErr_Occurred()) SWIG_fail;
arg3 = (unsigned char)SWIG_As_unsigned_SS_char(obj2);
if (PyErr_Occurred()) SWIG_fail;
arg4 = (unsigned char)SWIG_As_unsigned_SS_char(obj3);
if (PyErr_Occurred()) SWIG_fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (bool)(arg1)->ConvertColourToAlpha(arg2,arg3,arg4);
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;
}
{
resultobj = result ? Py_True : Py_False; Py_INCREF(resultobj);
}
return resultobj;
fail:
return NULL;
}
static PyObject *_wrap_Image_SetMaskFromImage(PyObject *, PyObject *args, PyObject *kwargs) {
PyObject *resultobj;
wxImage *arg1 = (wxImage *) 0 ;
@ -41412,6 +41477,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Point2D_Get", (PyCFunction) _wrap_Point2D_Get, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Point2D_swigregister", Point2D_swigregister, METH_VARARGS, NULL },
{ (char *)"new_InputStream", (PyCFunction) _wrap_new_InputStream, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"delete_InputStream", (PyCFunction) _wrap_delete_InputStream, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_close", (PyCFunction) _wrap_InputStream_close, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_flush", (PyCFunction) _wrap_InputStream_flush, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"InputStream_eof", (PyCFunction) _wrap_InputStream_eof, METH_VARARGS | METH_KEYWORDS, NULL },
@ -41520,6 +41586,7 @@ static PyMethodDef SwigMethods[] = {
{ (char *)"Image_HasAlpha", (PyCFunction) _wrap_Image_HasAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_FindFirstUnusedColour", (PyCFunction) _wrap_Image_FindFirstUnusedColour, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_ConvertAlphaToMask", (PyCFunction) _wrap_Image_ConvertAlphaToMask, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_ConvertColourToAlpha", (PyCFunction) _wrap_Image_ConvertColourToAlpha, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_SetMaskFromImage", (PyCFunction) _wrap_Image_SetMaskFromImage, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_CanRead", (PyCFunction) _wrap_Image_CanRead, METH_VARARGS | METH_KEYWORDS, NULL },
{ (char *)"Image_GetImageCount", (PyCFunction) _wrap_Image_GetImageCount, METH_VARARGS | METH_KEYWORDS, NULL },

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

@ -2443,8 +2443,8 @@ def EncodingConverter_CanConvert(*args, **kwargs):
# to the default catalog path.
if wx.Platform == "__WXMSW__":
import os
localedir = os.path.join(os.path.split(__file__)[0], "locale")
Locale_AddCatalogLookupPathPrefix(localedir)
_localedir = os.path.join(os.path.split(__file__)[0], "locale")
Locale.AddCatalogLookupPathPrefix(_localedir)
del os
#----------------------------------------------------------------------------

14
wxPython/src/msw/_misc.py
View File

@ -5764,7 +5764,7 @@ class StandardPaths(object):
"""
Get() -> StandardPaths
Return the global standard paths object
Return the global standard paths singleton
"""
return _misc_.StandardPaths_Get(*args, **kwargs)
@ -5774,7 +5774,7 @@ class StandardPaths(object):
GetConfigDir(self) -> String
Return the directory with system config files: /etc under Unix,
c:\Documents and Settings\All Users\Application Data under Windows,
'c:\Documents and Settings\All Users\Application Data' under Windows,
/Library/Preferences for Mac
"""
return _misc_.StandardPaths_GetConfigDir(*args, **kwargs)
@ -5784,7 +5784,7 @@ class StandardPaths(object):
GetUserConfigDir(self) -> String
Return the directory for the user config files: $HOME under Unix,
c:\Documents and Settings\username under Windows,
'c:\Documents and Settings\username' under Windows, and
~/Library/Preferences under Mac
Only use this if you have a single file to put there, otherwise
@ -5798,7 +5798,7 @@ class StandardPaths(object):
Return the location of the application's global, (i.e. not
user-specific,) data files: prefix/share/appname under Unix,
c:\Program Filesppname under Windows,
'c:\Program Files\appname' under Windows,
appname.app/Contents/SharedSupport app bundle directory under Mac.
"""
return _misc_.StandardPaths_GetDataDir(*args, **kwargs)
@ -5819,7 +5819,7 @@ class StandardPaths(object):
Return the directory for the user-dependent application data files:
$HOME/.appname under Unix, c:\Documents and
Settings\username\Application Datappname under Windows and
Settings\username\Application Data\appname under Windows and
~/Library/Application Support/appname under Mac
"""
return _misc_.StandardPaths_GetUserDataDir(*args, **kwargs)
@ -5832,7 +5832,7 @@ class StandardPaths(object):
with the other machines
Same as `GetUserDataDir` for all platforms except Windows where it is
the 'Local Settings\Application Datappname' directory.
the 'Local Settings\Application Data\appname' directory.
"""
return _misc_.StandardPaths_GetUserLocalDataDir(*args, **kwargs)
@ -5866,7 +5866,7 @@ def StandardPaths_Get(*args, **kwargs):
"""
StandardPaths_Get() -> StandardPaths
Return the global standard paths object
Return the global standard paths singleton
"""
return _misc_.StandardPaths_Get(*args, **kwargs)

8
wxPython/src/msw/_misc_wrap.cpp
View File

@ -1761,6 +1761,9 @@ PyObject *wxDisplay_GetModes(wxDisplay *self,wxVideoMode const &mode){
#include <wx/stdpaths.h>
wxStandardPaths *StandardPaths_Get(){
return (wxStandardPaths*) &wxStandardPaths::Get();
}
void wxStandardPaths_SetInstallPrefix(wxStandardPaths *self,wxString const &prefix){}
wxString wxStandardPaths_GetInstallPrefix(wxStandardPaths *self){ return wxEmptyString; }
#ifdef __cplusplus
@ -28601,10 +28604,7 @@ static PyObject *_wrap_StandardPaths_Get(PyObject *, PyObject *args, PyObject *k
if(!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)":StandardPaths_Get",kwnames)) goto fail;
{
PyThreadState* __tstate = wxPyBeginAllowThreads();
{
wxStandardPaths &_result_ref = wxStandardPaths::Get();
result = (wxStandardPaths *) &_result_ref;
}
result = (wxStandardPaths *)StandardPaths_Get();
wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail;

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

@ -1615,7 +1615,7 @@ HF_BOOKMARKS = _html.HF_BOOKMARKS
HF_OPENFILES = _html.HF_OPENFILES
HF_PRINT = _html.HF_PRINT
HF_DEFAULTSTYLE = _html.HF_DEFAULTSTYLE
class HtmlHelpController(_core.EvtHandler):
class HtmlHelpController(_core.Object):
def __repr__(self):
return "<%s.%s; proxy of C++ wxHtmlHelpController instance at %s>" % (self.__class__.__module__, self.__class__.__name__, self.this,)
def __init__(self, *args, **kwargs):
@ -1624,8 +1624,6 @@ class HtmlHelpController(_core.EvtHandler):
self.this = newobj.this
self.thisown = 1
del newobj.thisown
self._setOORInfo(self)
def __del__(self, destroy=_html.delete_HtmlHelpController):
"""__del__(self)"""
try:

7
wxPython/src/msw/html_wrap.cpp
View File

@ -12064,7 +12064,7 @@ static void *_p_wxChildFocusEventTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvent *)(wxCommandEvent *) ((wxChildFocusEvent *) x));
}
static void *_p_wxHtmlHelpControllerTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *) ((wxHtmlHelpController *) x));
return (void *)((wxObject *) ((wxHtmlHelpController *) x));
}
static void *_p_wxControlWithItemsTo_p_wxObject(void *x) {
return (void *)((wxObject *) (wxEvtHandler *)(wxWindow *)(wxControl *) ((wxControlWithItems *) x));
@ -12201,9 +12201,6 @@ static void *_p_wxPyWindowTo_p_wxEvtHandler(void *x) {
static void *_p_wxPreviewCanvasTo_p_wxEvtHandler(void *x) {
return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxScrolledWindow *) ((wxPreviewCanvas *) x));
}
static void *_p_wxHtmlHelpControllerTo_p_wxEvtHandler(void *x) {
return (void *)((wxEvtHandler *) ((wxHtmlHelpController *) x));
}
static void *_p_wxPyHtmlListBoxTo_p_wxEvtHandler(void *x) {
return (void *)((wxEvtHandler *) (wxWindow *)(wxPanel *)(wxPyVScrolledWindow *)(wxPyVListBox *) ((wxPyHtmlListBox *) x));
}
@ -12315,7 +12312,7 @@ static swig_type_info _swigt__p_wxString[] = {{"_p_wxString", 0, "wxString *", 0
static swig_type_info _swigt__p_wxPyHtmlWinTagHandler[] = {{"_p_wxPyHtmlWinTagHandler", 0, "wxPyHtmlWinTagHandler *", 0, 0, 0, 0},{"_p_wxPyHtmlWinTagHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxHtmlTagHandler[] = {{"_p_wxHtmlTagHandler", 0, "wxHtmlTagHandler *", 0, 0, 0, 0},{"_p_wxHtmlTagHandler", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxPyHtmlTagHandler[] = {{"_p_wxPyHtmlTagHandler", 0, "wxPyHtmlTagHandler *", 0, 0, 0, 0},{"_p_wxPyHtmlTagHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWinTagHandler", _p_wxPyHtmlWinTagHandlerTo_p_wxPyHtmlTagHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPasswordEntryDialog", _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpController", _p_wxHtmlHelpControllerTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxEvtHandler[] = {{"_p_wxEvtHandler", 0, "wxEvtHandler *", 0, 0, 0, 0},{"_p_wxSplashScreen", _p_wxSplashScreenTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMiniFrame", _p_wxMiniFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPanel", _p_wxPyPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenuBar", _p_wxMenuBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxValidator", _p_wxValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyValidator", _p_wxPyValidatorTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMessageDialog", _p_wxMessageDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFindReplaceDialog", _p_wxFindReplaceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxProgressDialog", _p_wxProgressDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPasswordEntryDialog", _p_wxPasswordEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTextEntryDialog", _p_wxTextEntryDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSingleChoiceDialog", _p_wxSingleChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMultiChoiceDialog", _p_wxMultiChoiceDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFileDialog", _p_wxFileDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPanel", _p_wxPanelTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxStatusBar", _p_wxStatusBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTopLevelWindow", _p_wxTopLevelWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIClientWindow", _p_wxMDIClientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVScrolledWindow", _p_wxPyVScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlWindow", _p_wxPyHtmlWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyScrolledWindow", _p_wxPyScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxScrolledWindow", _p_wxScrolledWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxWindow", _p_wxWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashWindow", _p_wxSashWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplitterWindow", _p_wxSplitterWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSplashScreenWindow", _p_wxSplashScreenWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxSashLayoutWindow", _p_wxSashLayoutWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPopupWindow", _p_wxPopupWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPopupTransientWindow", _p_wxPyPopupTransientWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxTipWindow", _p_wxTipWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewFrame", _p_wxPyPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewFrame", _p_wxPreviewFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControl", _p_wxControlTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIChildFrame", _p_wxMDIChildFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyApp", _p_wxPyAppTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxControlWithItems", _p_wxControlWithItemsTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxEvtHandler", 0, 0, 0, 0, 0, 0},{"_p_wxPreviewCanvas", _p_wxPreviewCanvasTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyWindow", _p_wxPyWindowTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyHtmlListBox", _p_wxPyHtmlListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyVListBox", _p_wxPyVListBoxTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyPreviewControlBar", _p_wxPyPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPreviewControlBar", _p_wxPreviewControlBarTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPyTaskBarIcon", _p_wxPyTaskBarIconTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxHtmlHelpFrame", _p_wxHtmlHelpFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFrame", _p_wxFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxPageSetupDialog", _p_wxPageSetupDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDialog", _p_wxDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxColourDialog", _p_wxColourDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxDirDialog", _p_wxDirDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxFontDialog", _p_wxFontDialogTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMenu", _p_wxMenuTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{"_p_wxMDIParentFrame", _p_wxMDIParentFrameTo_p_wxEvtHandler, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxPoint[] = {{"_p_wxPoint", 0, "wxPoint *", 0, 0, 0, 0},{"_p_wxPoint", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxHtmlHelpController[] = {{"_p_wxHtmlHelpController", 0, "wxHtmlHelpController *", 0, 0, 0, 0},{"_p_wxHtmlHelpController", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};
static swig_type_info _swigt__p_wxCursor[] = {{"_p_wxCursor", 0, "wxCursor *", 0, 0, 0, 0},{"_p_wxCursor", 0, 0, 0, 0, 0, 0},{0, 0, 0, 0, 0, 0, 0}};