Updates for recent changes to wx, and some other little tweaks and fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -81,6 +81,7 @@ D. Change to the wx2\include\wx\msw directory and copy setup0.h to
|
|||||||
wxUSE_DEBUG_NEW_ALWAYS 0
|
wxUSE_DEBUG_NEW_ALWAYS 0
|
||||||
wxUSE_CMDLINE_PARSER 0
|
wxUSE_CMDLINE_PARSER 0
|
||||||
wxUSE_DIALUP_MANAGER 0
|
wxUSE_DIALUP_MANAGER 0
|
||||||
|
wxUSE_DYNAMIC_LOADER 0
|
||||||
wxUSE_TREELAYOUT 0
|
wxUSE_TREELAYOUT 0
|
||||||
wxUSE_POSTSCRIPT 1
|
wxUSE_POSTSCRIPT 1
|
||||||
|
|
||||||
|
@@ -1046,18 +1046,18 @@ static PyObject *_wrap_wxXmlResource_AttachUnknownControl(PyObject *self, PyObje
|
|||||||
return _resultobj;
|
return _resultobj;
|
||||||
}
|
}
|
||||||
|
|
||||||
static PyObject *_wrap_wxXmlResource_GetXMLID(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_wxXmlResource_GetXRCID(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
PyObject * _resultobj;
|
PyObject * _resultobj;
|
||||||
int _result;
|
int _result;
|
||||||
char * _arg0;
|
char * _arg0;
|
||||||
char *_kwnames[] = { "str_id", NULL };
|
char *_kwnames[] = { "str_id", NULL };
|
||||||
|
|
||||||
self = self;
|
self = self;
|
||||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxXmlResource_GetXMLID",_kwnames,&_arg0))
|
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"s:wxXmlResource_GetXRCID",_kwnames,&_arg0))
|
||||||
return NULL;
|
return NULL;
|
||||||
{
|
{
|
||||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||||
_result = (int )wxXmlResource::GetXMLID(_arg0);
|
_result = (int )wxXmlResource::GetXRCID(_arg0);
|
||||||
|
|
||||||
wxPyEndAllowThreads(__tstate);
|
wxPyEndAllowThreads(__tstate);
|
||||||
if (PyErr_Occurred()) return NULL;
|
if (PyErr_Occurred()) return NULL;
|
||||||
@@ -1189,7 +1189,7 @@ static PyMethodDef xrccMethods[] = {
|
|||||||
{ "wxXmlResource_Get", (PyCFunction) _wrap_wxXmlResource_Get, METH_VARARGS | METH_KEYWORDS },
|
{ "wxXmlResource_Get", (PyCFunction) _wrap_wxXmlResource_Get, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxXmlResource_CompareVersion", (PyCFunction) _wrap_wxXmlResource_CompareVersion, METH_VARARGS | METH_KEYWORDS },
|
{ "wxXmlResource_CompareVersion", (PyCFunction) _wrap_wxXmlResource_CompareVersion, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxXmlResource_GetVersion", (PyCFunction) _wrap_wxXmlResource_GetVersion, METH_VARARGS | METH_KEYWORDS },
|
{ "wxXmlResource_GetVersion", (PyCFunction) _wrap_wxXmlResource_GetVersion, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxXmlResource_GetXMLID", (PyCFunction) _wrap_wxXmlResource_GetXMLID, METH_VARARGS | METH_KEYWORDS },
|
{ "wxXmlResource_GetXRCID", (PyCFunction) _wrap_wxXmlResource_GetXRCID, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxXmlResource_AttachUnknownControl", (PyCFunction) _wrap_wxXmlResource_AttachUnknownControl, METH_VARARGS | METH_KEYWORDS },
|
{ "wxXmlResource_AttachUnknownControl", (PyCFunction) _wrap_wxXmlResource_AttachUnknownControl, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxXmlResource_LoadIcon", (PyCFunction) _wrap_wxXmlResource_LoadIcon, METH_VARARGS | METH_KEYWORDS },
|
{ "wxXmlResource_LoadIcon", (PyCFunction) _wrap_wxXmlResource_LoadIcon, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxXmlResource_LoadBitmap", (PyCFunction) _wrap_wxXmlResource_LoadBitmap, METH_VARARGS | METH_KEYWORDS },
|
{ "wxXmlResource_LoadBitmap", (PyCFunction) _wrap_wxXmlResource_LoadBitmap, METH_VARARGS | METH_KEYWORDS },
|
||||||
|
@@ -122,7 +122,7 @@ public:
|
|||||||
// Returns numeric ID that is equivalent to string id used in XML
|
// Returns numeric ID that is equivalent to string id used in XML
|
||||||
// resource. To be used in event tables
|
// resource. To be used in event tables
|
||||||
// Macro XMLID is provided for convenience
|
// Macro XMLID is provided for convenience
|
||||||
static int GetXMLID(const char *str_id);
|
static int GetXRCID(const char *str_id);
|
||||||
|
|
||||||
// Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
|
// Returns version info (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a)
|
||||||
long GetVersion() const;
|
long GetVersion() const;
|
||||||
@@ -142,12 +142,14 @@ public:
|
|||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
|
||||||
%pragma(python) code = "
|
%pragma(python) code = "
|
||||||
def XMLID(str_id):
|
def XRCID(str_id):
|
||||||
return wxXmlResource_GetXMLID(str_id)
|
return wxXmlResource_GetXRCID(str_id)
|
||||||
|
|
||||||
def XMLCTRL(window, str_id, *args):
|
def XRCCTRL(window, str_id, *ignoreargs):
|
||||||
return window.FindWindowById(XMLID(str_id))
|
return window.FindWindowById(XRCID(str_id))
|
||||||
|
|
||||||
|
XMLID = XRCID
|
||||||
|
XMLCTRL = XRCCTRL
|
||||||
"
|
"
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
@@ -41,12 +41,14 @@ from sizers import *
|
|||||||
|
|
||||||
from filesys import *
|
from filesys import *
|
||||||
|
|
||||||
def XMLID(str_id):
|
def XRCID(str_id):
|
||||||
return wxXmlResource_GetXMLID(str_id)
|
return wxXmlResource_GetXRCID(str_id)
|
||||||
|
|
||||||
def XMLCTRL(window, str_id, *args):
|
def XRCCTRL(window, str_id, *ignoreargs):
|
||||||
return window.FindWindowById(XMLID(str_id))
|
return window.FindWindowById(XRCID(str_id))
|
||||||
|
|
||||||
|
XMLID = XRCID
|
||||||
|
XMLCTRL = XRCCTRL
|
||||||
|
|
||||||
class wxXmlResourcePtr(wxObjectPtr):
|
class wxXmlResourcePtr(wxObjectPtr):
|
||||||
def __init__(self,this):
|
def __init__(self,this):
|
||||||
@@ -129,7 +131,7 @@ def wxXmlResource(*_args,**_kwargs):
|
|||||||
|
|
||||||
#-------------- FUNCTION WRAPPERS ------------------
|
#-------------- FUNCTION WRAPPERS ------------------
|
||||||
|
|
||||||
wxXmlResource_GetXMLID = xrcc.wxXmlResource_GetXMLID
|
wxXmlResource_GetXRCID = xrcc.wxXmlResource_GetXRCID
|
||||||
|
|
||||||
def wxXmlResource_Get(*_args, **_kwargs):
|
def wxXmlResource_Get(*_args, **_kwargs):
|
||||||
val = apply(xrcc.wxXmlResource_Get,_args,_kwargs)
|
val = apply(xrcc.wxXmlResource_Get,_args,_kwargs)
|
||||||
|
@@ -28,12 +28,23 @@ class TestPanel(wxPanel):
|
|||||||
|
|
||||||
list.sort()
|
list.sort()
|
||||||
|
|
||||||
wxStaticText(self, -1, "Face names:", wxPoint(15, 50), wxSize(65, 18))
|
wxStaticText(self, -1, "Face names:", (15, 50), (65, 18))
|
||||||
self.lb1 = wxListBox(self, 60, wxPoint(80, 50), wxSize(200, 250),
|
self.lb1 = wxListBox(self, -1, (80, 50), (200, 250),
|
||||||
list, wxLB_SINGLE)
|
list, wxLB_SINGLE)
|
||||||
|
EVT_LISTBOX(self, self.lb1.GetId(), self.OnSelect)
|
||||||
|
|
||||||
|
self.txt = wxStaticText(self, -1, "Sample text...", (285, 50))
|
||||||
|
|
||||||
self.lb1.SetSelection(0)
|
self.lb1.SetSelection(0)
|
||||||
|
|
||||||
|
|
||||||
|
def OnSelect(self, evt):
|
||||||
|
face = self.lb1.GetStringSelection()
|
||||||
|
font = wxFont(28, wxDEFAULT, wxNORMAL, wxNORMAL, false, face)
|
||||||
|
self.txt.SetFont(font)
|
||||||
|
self.txt.SetSize(self.txt.GetBestSize())
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#----------------------------------------------------------------------
|
#----------------------------------------------------------------------
|
||||||
|
|
||||||
|
@@ -8,13 +8,13 @@ class TestPanel(wxPanel):
|
|||||||
self.log = log
|
self.log = log
|
||||||
|
|
||||||
txt1 = wxStaticText(self, -1, "style=0")
|
txt1 = wxStaticText(self, -1, "style=0")
|
||||||
dir1 = wxGenericDirCtrl(self, -1, size=(200,250), style=0)
|
dir1 = wxGenericDirCtrl(self, -1, size=(200,225), style=0)
|
||||||
|
|
||||||
txt2 = wxStaticText(self, -1, "wxDIRCTRL_DIR_ONLY")
|
txt2 = wxStaticText(self, -1, "wxDIRCTRL_DIR_ONLY")
|
||||||
dir2 = wxGenericDirCtrl(self, -1, size=(200,250), style=wxDIRCTRL_DIR_ONLY)
|
dir2 = wxGenericDirCtrl(self, -1, size=(200,225), style=wxDIRCTRL_DIR_ONLY)
|
||||||
|
|
||||||
txt3 = wxStaticText(self, -1, "wxDIRCTRL_SHOW_FILTERS")
|
txt3 = wxStaticText(self, -1, "wxDIRCTRL_SHOW_FILTERS")
|
||||||
dir3 = wxGenericDirCtrl(self, -1, size=(200,250), style=wxDIRCTRL_SHOW_FILTERS,
|
dir3 = wxGenericDirCtrl(self, -1, size=(200,225), style=wxDIRCTRL_SHOW_FILTERS,
|
||||||
filter="All files (*.*)|*.*|Python files (*.py)|*.py")
|
filter="All files (*.*)|*.*|Python files (*.py)|*.py")
|
||||||
|
|
||||||
sz = wxFlexGridSizer(cols=3, hgap=5, vgap=5)
|
sz = wxFlexGridSizer(cols=3, hgap=5, vgap=5)
|
||||||
|
@@ -465,9 +465,6 @@ enum {
|
|||||||
wxLI_HORIZONTAL,
|
wxLI_HORIZONTAL,
|
||||||
wxLI_VERTICAL,
|
wxLI_VERTICAL,
|
||||||
|
|
||||||
wxHW_SCROLLBAR_NEVER,
|
|
||||||
wxHW_SCROLLBAR_AUTO,
|
|
||||||
|
|
||||||
wxJOYSTICK1,
|
wxJOYSTICK1,
|
||||||
wxJOYSTICK2,
|
wxJOYSTICK2,
|
||||||
wxJOY_BUTTON1,
|
wxJOY_BUTTON1,
|
||||||
|
@@ -73,6 +73,27 @@ enum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
enum {
|
||||||
|
wxHW_SCROLLBAR_NEVER,
|
||||||
|
wxHW_SCROLLBAR_AUTO,
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// enums for wxHtmlWindow::OnOpeningURL
|
||||||
|
enum wxHtmlOpeningStatus
|
||||||
|
{
|
||||||
|
wxHTML_OPEN,
|
||||||
|
wxHTML_BLOCK,
|
||||||
|
wxHTML_REDIRECT
|
||||||
|
};
|
||||||
|
|
||||||
|
enum wxHtmlURLType
|
||||||
|
{
|
||||||
|
wxHTML_URL_PAGE,
|
||||||
|
wxHTML_URL_IMAGE,
|
||||||
|
wxHTML_URL_OTHER
|
||||||
|
};
|
||||||
|
|
||||||
//---------------------------------------------------------------------------
|
//---------------------------------------------------------------------------
|
||||||
|
|
||||||
class wxHtmlLinkInfo : public wxObject {
|
class wxHtmlLinkInfo : public wxObject {
|
||||||
@@ -127,9 +148,7 @@ public:
|
|||||||
void PushTagHandler(wxHtmlTagHandler* handler, wxString tags);
|
void PushTagHandler(wxHtmlTagHandler* handler, wxString tags);
|
||||||
void PopTagHandler();
|
void PopTagHandler();
|
||||||
|
|
||||||
// Returns TRUE if the parser is allowed to open given URL (may be forbidden
|
// virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const;
|
||||||
// for security reasons)
|
|
||||||
virtual bool CanOpenURL(const wxString& url) const { return TRUE; }
|
|
||||||
|
|
||||||
// void AddText(const char* txt) = 0;
|
// void AddText(const char* txt) = 0;
|
||||||
// void AddTag(const wxHtmlTag& tag);
|
// void AddTag(const wxHtmlTag& tag);
|
||||||
@@ -427,10 +446,14 @@ public:
|
|||||||
void OnLinkClicked(const wxHtmlLinkInfo& link);
|
void OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||||
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
|
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||||
|
|
||||||
|
wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
|
||||||
|
const wxString& url,
|
||||||
|
wxString *redirect) const;
|
||||||
|
|
||||||
DEC_PYCALLBACK__STRING(OnSetTitle);
|
DEC_PYCALLBACK__STRING(OnSetTitle);
|
||||||
DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);
|
DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);
|
||||||
DEC_PYCALLBACK__CELLINTINTME(OnCellClicked);
|
DEC_PYCALLBACK__CELLINTINTME(OnCellClicked);
|
||||||
DEC_PYCALLBACK_BOOL_STRING(OnOpeningURL);
|
// DEC_PYCALLBACK_BOOL_STRING(OnOpeningURL);
|
||||||
PYPRIVATE;
|
PYPRIVATE;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -438,7 +461,7 @@ IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
|
|||||||
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
|
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
|
||||||
IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);
|
IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);
|
||||||
IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
|
IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
|
||||||
IMP_PYCALLBACK_BOOL_STRING(wxPyHtmlWindow, wxHtmlWindow, OnOpeningURL);
|
// IMP_PYCALLBACK_BOOL_STRING(wxPyHtmlWindow, wxHtmlWindow, OnOpeningURL);
|
||||||
|
|
||||||
|
|
||||||
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
|
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
|
||||||
@@ -457,6 +480,40 @@ void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
|
|||||||
wxHtmlWindow::OnLinkClicked(link);
|
wxHtmlWindow::OnLinkClicked(link);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
|
||||||
|
const wxString& url,
|
||||||
|
wxString *redirect) const {
|
||||||
|
bool found;
|
||||||
|
wxHtmlOpeningStatus rval;
|
||||||
|
wxPyBeginBlockThreads();
|
||||||
|
if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) {
|
||||||
|
PyObject* ro;
|
||||||
|
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(is)", type, url.c_str()));
|
||||||
|
if (PyString_Check(ro)
|
||||||
|
#if PYTHON_API_VERSION >= 1009
|
||||||
|
|| PyUnicode_Check(ro)
|
||||||
|
#endif
|
||||||
|
) {
|
||||||
|
PyObject* str = PyObject_Str(ro);
|
||||||
|
*redirect = PyString_AsString(str);
|
||||||
|
Py_DECREF(str);
|
||||||
|
rval = wxHTML_REDIRECT;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
PyObject* num = PyNumber_Int(ro);
|
||||||
|
rval = (wxHtmlOpeningStatus)PyInt_AsLong(num);
|
||||||
|
Py_DECREF(num);
|
||||||
|
}
|
||||||
|
Py_DECREF(ro);
|
||||||
|
}
|
||||||
|
wxPyEndBlockThreads();
|
||||||
|
if (! found)
|
||||||
|
rval = wxHtmlWindow::OnOpeningURL(type, url, redirect);
|
||||||
|
return rval;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
||||||
|
@@ -377,7 +377,7 @@ wxString wxGetFullHostName();
|
|||||||
wxString wxGetUserId();
|
wxString wxGetUserId();
|
||||||
wxString wxGetUserName();
|
wxString wxGetUserName();
|
||||||
wxString wxGetHomeDir();
|
wxString wxGetHomeDir();
|
||||||
|
wxString wxGetUserHome(const char* user = "");
|
||||||
|
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
|
|
||||||
|
@@ -186,6 +186,7 @@ enum wxSystemColour
|
|||||||
{
|
{
|
||||||
wxSYS_COLOUR_SCROLLBAR,
|
wxSYS_COLOUR_SCROLLBAR,
|
||||||
wxSYS_COLOUR_BACKGROUND,
|
wxSYS_COLOUR_BACKGROUND,
|
||||||
|
wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND,
|
||||||
wxSYS_COLOUR_ACTIVECAPTION,
|
wxSYS_COLOUR_ACTIVECAPTION,
|
||||||
wxSYS_COLOUR_INACTIVECAPTION,
|
wxSYS_COLOUR_INACTIVECAPTION,
|
||||||
wxSYS_COLOUR_MENU,
|
wxSYS_COLOUR_MENU,
|
||||||
@@ -200,23 +201,28 @@ enum wxSystemColour
|
|||||||
wxSYS_COLOUR_HIGHLIGHT,
|
wxSYS_COLOUR_HIGHLIGHT,
|
||||||
wxSYS_COLOUR_HIGHLIGHTTEXT,
|
wxSYS_COLOUR_HIGHLIGHTTEXT,
|
||||||
wxSYS_COLOUR_BTNFACE,
|
wxSYS_COLOUR_BTNFACE,
|
||||||
|
wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
|
||||||
wxSYS_COLOUR_BTNSHADOW,
|
wxSYS_COLOUR_BTNSHADOW,
|
||||||
|
wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,
|
||||||
wxSYS_COLOUR_GRAYTEXT,
|
wxSYS_COLOUR_GRAYTEXT,
|
||||||
wxSYS_COLOUR_BTNTEXT,
|
wxSYS_COLOUR_BTNTEXT,
|
||||||
wxSYS_COLOUR_INACTIVECAPTIONTEXT,
|
wxSYS_COLOUR_INACTIVECAPTIONTEXT,
|
||||||
wxSYS_COLOUR_BTNHIGHLIGHT,
|
wxSYS_COLOUR_BTNHIGHLIGHT,
|
||||||
|
wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
|
||||||
|
wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
|
||||||
|
wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
|
||||||
wxSYS_COLOUR_3DDKSHADOW,
|
wxSYS_COLOUR_3DDKSHADOW,
|
||||||
wxSYS_COLOUR_3DLIGHT,
|
wxSYS_COLOUR_3DLIGHT,
|
||||||
wxSYS_COLOUR_INFOTEXT,
|
wxSYS_COLOUR_INFOTEXT,
|
||||||
wxSYS_COLOUR_INFOBK,
|
wxSYS_COLOUR_INFOBK,
|
||||||
wxSYS_COLOUR_LISTBOX,
|
wxSYS_COLOUR_LISTBOX,
|
||||||
|
wxSYS_COLOUR_HOTLIGHT,
|
||||||
|
wxSYS_COLOUR_GRADIENTACTIVECAPTION,
|
||||||
|
wxSYS_COLOUR_GRADIENTINACTIVECAPTION,
|
||||||
|
wxSYS_COLOUR_MENUHILIGHT,
|
||||||
|
wxSYS_COLOUR_MENUBAR,
|
||||||
|
|
||||||
wxSYS_COLOUR_DESKTOP = wxSYS_COLOUR_BACKGROUND,
|
wxSYS_COLOUR_MAX
|
||||||
wxSYS_COLOUR_3DFACE = wxSYS_COLOUR_BTNFACE,
|
|
||||||
wxSYS_COLOUR_3DSHADOW = wxSYS_COLOUR_BTNSHADOW,
|
|
||||||
wxSYS_COLOUR_3DHIGHLIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
|
|
||||||
wxSYS_COLOUR_3DHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT,
|
|
||||||
wxSYS_COLOUR_BTNHILIGHT = wxSYS_COLOUR_BTNHIGHLIGHT
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// possible values for wxSystemSettings::GetMetric() parameter
|
// possible values for wxSystemSettings::GetMetric() parameter
|
||||||
|
@@ -206,10 +206,14 @@ public:
|
|||||||
void OnLinkClicked(const wxHtmlLinkInfo& link);
|
void OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||||
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
|
void base_OnLinkClicked(const wxHtmlLinkInfo& link);
|
||||||
|
|
||||||
|
wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType type,
|
||||||
|
const wxString& url,
|
||||||
|
wxString *redirect) const;
|
||||||
|
|
||||||
DEC_PYCALLBACK__STRING(OnSetTitle);
|
DEC_PYCALLBACK__STRING(OnSetTitle);
|
||||||
DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);
|
DEC_PYCALLBACK__CELLINTINT(OnCellMouseHover);
|
||||||
DEC_PYCALLBACK__CELLINTINTME(OnCellClicked);
|
DEC_PYCALLBACK__CELLINTINTME(OnCellClicked);
|
||||||
DEC_PYCALLBACK_BOOL_STRING(OnOpeningURL);
|
// DEC_PYCALLBACK_BOOL_STRING(OnOpeningURL);
|
||||||
PYPRIVATE;
|
PYPRIVATE;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -217,7 +221,7 @@ IMPLEMENT_ABSTRACT_CLASS( wxPyHtmlWindow, wxHtmlWindow );
|
|||||||
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
|
IMP_PYCALLBACK__STRING(wxPyHtmlWindow, wxHtmlWindow, OnSetTitle);
|
||||||
IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);
|
IMP_PYCALLBACK__CELLINTINT(wxPyHtmlWindow, wxHtmlWindow, OnCellMouseHover);
|
||||||
IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
|
IMP_PYCALLBACK__CELLINTINTME(wxPyHtmlWindow, wxHtmlWindow, OnCellClicked);
|
||||||
IMP_PYCALLBACK_BOOL_STRING(wxPyHtmlWindow, wxHtmlWindow, OnOpeningURL);
|
// IMP_PYCALLBACK_BOOL_STRING(wxPyHtmlWindow, wxHtmlWindow, OnOpeningURL);
|
||||||
|
|
||||||
|
|
||||||
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
|
void wxPyHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) {
|
||||||
@@ -237,6 +241,40 @@ void wxPyHtmlWindow::base_OnLinkClicked(const wxHtmlLinkInfo& link) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type,
|
||||||
|
const wxString& url,
|
||||||
|
wxString *redirect) const {
|
||||||
|
bool found;
|
||||||
|
wxHtmlOpeningStatus rval;
|
||||||
|
wxPyBeginBlockThreads();
|
||||||
|
if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) {
|
||||||
|
PyObject* ro;
|
||||||
|
ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(is)", type, url.c_str()));
|
||||||
|
if (PyString_Check(ro)
|
||||||
|
#if PYTHON_API_VERSION >= 1009
|
||||||
|
|| PyUnicode_Check(ro)
|
||||||
|
#endif
|
||||||
|
) {
|
||||||
|
PyObject* str = PyObject_Str(ro);
|
||||||
|
*redirect = PyString_AsString(str);
|
||||||
|
Py_DECREF(str);
|
||||||
|
rval = wxHTML_REDIRECT;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
PyObject* num = PyNumber_Int(ro);
|
||||||
|
rval = (wxHtmlOpeningStatus)PyInt_AsLong(num);
|
||||||
|
Py_DECREF(num);
|
||||||
|
}
|
||||||
|
Py_DECREF(ro);
|
||||||
|
}
|
||||||
|
wxPyEndBlockThreads();
|
||||||
|
if (! found)
|
||||||
|
rval = wxHtmlWindow::OnOpeningURL(type, url, redirect);
|
||||||
|
return rval;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void wxHtmlWindow_AddFilter(wxHtmlFilter *filter) {
|
void wxHtmlWindow_AddFilter(wxHtmlFilter *filter) {
|
||||||
wxHtmlWindow::AddFilter(filter);
|
wxHtmlWindow::AddFilter(filter);
|
||||||
}
|
}
|
||||||
@@ -1268,58 +1306,6 @@ static PyObject *_wrap_wxHtmlParser_PopTagHandler(PyObject *self, PyObject *args
|
|||||||
return _resultobj;
|
return _resultobj;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define wxHtmlParser_CanOpenURL(_swigobj,_swigarg0) (_swigobj->CanOpenURL(_swigarg0))
|
|
||||||
static PyObject *_wrap_wxHtmlParser_CanOpenURL(PyObject *self, PyObject *args, PyObject *kwargs) {
|
|
||||||
PyObject * _resultobj;
|
|
||||||
bool _result;
|
|
||||||
wxHtmlParser * _arg0;
|
|
||||||
wxString * _arg1;
|
|
||||||
PyObject * _argo0 = 0;
|
|
||||||
PyObject * _obj1 = 0;
|
|
||||||
char *_kwnames[] = { "self","url", NULL };
|
|
||||||
|
|
||||||
self = self;
|
|
||||||
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxHtmlParser_CanOpenURL",_kwnames,&_argo0,&_obj1))
|
|
||||||
return NULL;
|
|
||||||
if (_argo0) {
|
|
||||||
if (_argo0 == Py_None) { _arg0 = NULL; }
|
|
||||||
else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxHtmlParser_p")) {
|
|
||||||
PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxHtmlParser_CanOpenURL. Expected _wxHtmlParser_p.");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
{
|
|
||||||
#if PYTHON_API_VERSION >= 1009
|
|
||||||
char* tmpPtr; int tmpSize;
|
|
||||||
if (!PyString_Check(_obj1) && !PyUnicode_Check(_obj1)) {
|
|
||||||
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
if (PyString_AsStringAndSize(_obj1, &tmpPtr, &tmpSize) == -1)
|
|
||||||
return NULL;
|
|
||||||
_arg1 = new wxString(tmpPtr, tmpSize);
|
|
||||||
#else
|
|
||||||
if (!PyString_Check(_obj1)) {
|
|
||||||
PyErr_SetString(PyExc_TypeError, wxStringErrorMsg);
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
_arg1 = new wxString(PyString_AS_STRING(_obj1), PyString_GET_SIZE(_obj1));
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
{
|
|
||||||
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
|
||||||
_result = (bool )wxHtmlParser_CanOpenURL(_arg0,*_arg1);
|
|
||||||
|
|
||||||
wxPyEndAllowThreads(__tstate);
|
|
||||||
if (PyErr_Occurred()) return NULL;
|
|
||||||
} _resultobj = Py_BuildValue("i",_result);
|
|
||||||
{
|
|
||||||
if (_obj1)
|
|
||||||
delete _arg1;
|
|
||||||
}
|
|
||||||
return _resultobj;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void *SwigwxHtmlWinParserTowxHtmlParser(void *ptr) {
|
static void *SwigwxHtmlWinParserTowxHtmlParser(void *ptr) {
|
||||||
wxHtmlWinParser *src;
|
wxHtmlWinParser *src;
|
||||||
wxHtmlParser *dest;
|
wxHtmlParser *dest;
|
||||||
@@ -4178,7 +4164,7 @@ static PyObject *_wrap_new_wxHtmlWindow(PyObject *self, PyObject *args, PyObject
|
|||||||
int _arg1 = (int ) -1;
|
int _arg1 = (int ) -1;
|
||||||
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
|
wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition;
|
||||||
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
|
wxSize * _arg3 = (wxSize *) &wxDefaultSize;
|
||||||
int _arg4 = (int ) wxHW_SCROLLBAR_AUTO;
|
int _arg4 = (int ) (wxHW_SCROLLBAR_AUTO);
|
||||||
char * _arg5 = (char *) "htmlWindow";
|
char * _arg5 = (char *) "htmlWindow";
|
||||||
PyObject * _argo0 = 0;
|
PyObject * _argo0 = 0;
|
||||||
wxPoint temp;
|
wxPoint temp;
|
||||||
@@ -4261,7 +4247,7 @@ static PyObject *_wrap_wxHtmlWindow_Create(PyObject *self, PyObject *args, PyObj
|
|||||||
int _arg2 = (int ) -1;
|
int _arg2 = (int ) -1;
|
||||||
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
|
wxPoint * _arg3 = (wxPoint *) &wxDefaultPosition;
|
||||||
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
|
wxSize * _arg4 = (wxSize *) &wxDefaultSize;
|
||||||
int _arg5 = (int ) wxHW_SCROLLBAR_AUTO;
|
int _arg5 = (int ) (wxHW_SCROLLBAR_AUTO);
|
||||||
char * _arg6 = (char *) "htmlWindow";
|
char * _arg6 = (char *) "htmlWindow";
|
||||||
PyObject * _argo0 = 0;
|
PyObject * _argo0 = 0;
|
||||||
PyObject * _argo1 = 0;
|
PyObject * _argo1 = 0;
|
||||||
@@ -6633,7 +6619,6 @@ static PyMethodDef htmlcMethods[] = {
|
|||||||
{ "wxHtmlWinParser_GetDC", (PyCFunction) _wrap_wxHtmlWinParser_GetDC, METH_VARARGS | METH_KEYWORDS },
|
{ "wxHtmlWinParser_GetDC", (PyCFunction) _wrap_wxHtmlWinParser_GetDC, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxHtmlWinParser_SetDC", (PyCFunction) _wrap_wxHtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS },
|
{ "wxHtmlWinParser_SetDC", (PyCFunction) _wrap_wxHtmlWinParser_SetDC, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "new_wxHtmlWinParser", (PyCFunction) _wrap_new_wxHtmlWinParser, METH_VARARGS | METH_KEYWORDS },
|
{ "new_wxHtmlWinParser", (PyCFunction) _wrap_new_wxHtmlWinParser, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxHtmlParser_CanOpenURL", (PyCFunction) _wrap_wxHtmlParser_CanOpenURL, METH_VARARGS | METH_KEYWORDS },
|
|
||||||
{ "wxHtmlParser_PopTagHandler", (PyCFunction) _wrap_wxHtmlParser_PopTagHandler, METH_VARARGS | METH_KEYWORDS },
|
{ "wxHtmlParser_PopTagHandler", (PyCFunction) _wrap_wxHtmlParser_PopTagHandler, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxHtmlParser_PushTagHandler", (PyCFunction) _wrap_wxHtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS },
|
{ "wxHtmlParser_PushTagHandler", (PyCFunction) _wrap_wxHtmlParser_PushTagHandler, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxHtmlParser_GetSource", (PyCFunction) _wrap_wxHtmlParser_GetSource, METH_VARARGS | METH_KEYWORDS },
|
{ "wxHtmlParser_GetSource", (PyCFunction) _wrap_wxHtmlParser_GetSource, METH_VARARGS | METH_KEYWORDS },
|
||||||
@@ -6828,6 +6813,14 @@ SWIGEXPORT(void) inithtmlc() {
|
|||||||
PyDict_SetItemString(d,"wxHTML_COND_ISANCHOR", PyInt_FromLong((long) wxHTML_COND_ISANCHOR));
|
PyDict_SetItemString(d,"wxHTML_COND_ISANCHOR", PyInt_FromLong((long) wxHTML_COND_ISANCHOR));
|
||||||
PyDict_SetItemString(d,"wxHTML_COND_ISIMAGEMAP", PyInt_FromLong((long) wxHTML_COND_ISIMAGEMAP));
|
PyDict_SetItemString(d,"wxHTML_COND_ISIMAGEMAP", PyInt_FromLong((long) wxHTML_COND_ISIMAGEMAP));
|
||||||
PyDict_SetItemString(d,"wxHTML_COND_USER", PyInt_FromLong((long) wxHTML_COND_USER));
|
PyDict_SetItemString(d,"wxHTML_COND_USER", PyInt_FromLong((long) wxHTML_COND_USER));
|
||||||
|
PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER));
|
||||||
|
PyDict_SetItemString(d,"wxHW_SCROLLBAR_AUTO", PyInt_FromLong((long) wxHW_SCROLLBAR_AUTO));
|
||||||
|
PyDict_SetItemString(d,"wxHTML_OPEN", PyInt_FromLong((long) wxHTML_OPEN));
|
||||||
|
PyDict_SetItemString(d,"wxHTML_BLOCK", PyInt_FromLong((long) wxHTML_BLOCK));
|
||||||
|
PyDict_SetItemString(d,"wxHTML_REDIRECT", PyInt_FromLong((long) wxHTML_REDIRECT));
|
||||||
|
PyDict_SetItemString(d,"wxHTML_URL_PAGE", PyInt_FromLong((long) wxHTML_URL_PAGE));
|
||||||
|
PyDict_SetItemString(d,"wxHTML_URL_IMAGE", PyInt_FromLong((long) wxHTML_URL_IMAGE));
|
||||||
|
PyDict_SetItemString(d,"wxHTML_URL_OTHER", PyInt_FromLong((long) wxHTML_URL_OTHER));
|
||||||
PyDict_SetItemString(d,"wxPAGE_ODD", PyInt_FromLong((long) wxPAGE_ODD));
|
PyDict_SetItemString(d,"wxPAGE_ODD", PyInt_FromLong((long) wxPAGE_ODD));
|
||||||
PyDict_SetItemString(d,"wxPAGE_EVEN", PyInt_FromLong((long) wxPAGE_EVEN));
|
PyDict_SetItemString(d,"wxPAGE_EVEN", PyInt_FromLong((long) wxPAGE_EVEN));
|
||||||
PyDict_SetItemString(d,"wxPAGE_ALL", PyInt_FromLong((long) wxPAGE_ALL));
|
PyDict_SetItemString(d,"wxPAGE_ALL", PyInt_FromLong((long) wxPAGE_ALL));
|
||||||
|
@@ -145,9 +145,6 @@ class wxHtmlParserPtr(wxObjectPtr):
|
|||||||
def PopTagHandler(self, *_args, **_kwargs):
|
def PopTagHandler(self, *_args, **_kwargs):
|
||||||
val = apply(htmlc.wxHtmlParser_PopTagHandler,(self,) + _args, _kwargs)
|
val = apply(htmlc.wxHtmlParser_PopTagHandler,(self,) + _args, _kwargs)
|
||||||
return val
|
return val
|
||||||
def CanOpenURL(self, *_args, **_kwargs):
|
|
||||||
val = apply(htmlc.wxHtmlParser_CanOpenURL,(self,) + _args, _kwargs)
|
|
||||||
return val
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return "<C wxHtmlParser instance at %s>" % (self.this,)
|
return "<C wxHtmlParser instance at %s>" % (self.this,)
|
||||||
class wxHtmlParser(wxHtmlParserPtr):
|
class wxHtmlParser(wxHtmlParserPtr):
|
||||||
@@ -756,6 +753,14 @@ wxHTML_INDENT_ALL = htmlc.wxHTML_INDENT_ALL
|
|||||||
wxHTML_COND_ISANCHOR = htmlc.wxHTML_COND_ISANCHOR
|
wxHTML_COND_ISANCHOR = htmlc.wxHTML_COND_ISANCHOR
|
||||||
wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP
|
wxHTML_COND_ISIMAGEMAP = htmlc.wxHTML_COND_ISIMAGEMAP
|
||||||
wxHTML_COND_USER = htmlc.wxHTML_COND_USER
|
wxHTML_COND_USER = htmlc.wxHTML_COND_USER
|
||||||
|
wxHW_SCROLLBAR_NEVER = htmlc.wxHW_SCROLLBAR_NEVER
|
||||||
|
wxHW_SCROLLBAR_AUTO = htmlc.wxHW_SCROLLBAR_AUTO
|
||||||
|
wxHTML_OPEN = htmlc.wxHTML_OPEN
|
||||||
|
wxHTML_BLOCK = htmlc.wxHTML_BLOCK
|
||||||
|
wxHTML_REDIRECT = htmlc.wxHTML_REDIRECT
|
||||||
|
wxHTML_URL_PAGE = htmlc.wxHTML_URL_PAGE
|
||||||
|
wxHTML_URL_IMAGE = htmlc.wxHTML_URL_IMAGE
|
||||||
|
wxHTML_URL_OTHER = htmlc.wxHTML_URL_OTHER
|
||||||
wxPAGE_ODD = htmlc.wxPAGE_ODD
|
wxPAGE_ODD = htmlc.wxPAGE_ODD
|
||||||
wxPAGE_EVEN = htmlc.wxPAGE_EVEN
|
wxPAGE_EVEN = htmlc.wxPAGE_EVEN
|
||||||
wxPAGE_ALL = htmlc.wxPAGE_ALL
|
wxPAGE_ALL = htmlc.wxPAGE_ALL
|
||||||
|
@@ -837,6 +837,30 @@ static PyObject *_wrap_wxGetHomeDir(PyObject *self, PyObject *args, PyObject *kw
|
|||||||
return _resultobj;
|
return _resultobj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PyObject *_wrap_wxGetUserHome(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
|
PyObject * _resultobj;
|
||||||
|
wxString * _result;
|
||||||
|
char * _arg0 = (char *) "";
|
||||||
|
char *_kwnames[] = { "user", NULL };
|
||||||
|
|
||||||
|
self = self;
|
||||||
|
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"|s:wxGetUserHome",_kwnames,&_arg0))
|
||||||
|
return NULL;
|
||||||
|
{
|
||||||
|
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||||
|
_result = new wxString (wxGetUserHome(_arg0));
|
||||||
|
|
||||||
|
wxPyEndAllowThreads(__tstate);
|
||||||
|
if (PyErr_Occurred()) return NULL;
|
||||||
|
}{
|
||||||
|
_resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
|
||||||
|
}
|
||||||
|
{
|
||||||
|
delete _result;
|
||||||
|
}
|
||||||
|
return _resultobj;
|
||||||
|
}
|
||||||
|
|
||||||
static PyObject *_wrap_wxGetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_wxGetAccelFromString(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
PyObject * _resultobj;
|
PyObject * _resultobj;
|
||||||
wxAcceleratorEntry * _result;
|
wxAcceleratorEntry * _result;
|
||||||
@@ -4166,6 +4190,7 @@ static PyMethodDef misccMethods[] = {
|
|||||||
{ "wxObject_Destroy", (PyCFunction) _wrap_wxObject_Destroy, METH_VARARGS | METH_KEYWORDS },
|
{ "wxObject_Destroy", (PyCFunction) _wrap_wxObject_Destroy, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxObject_GetClassName", (PyCFunction) _wrap_wxObject_GetClassName, METH_VARARGS | METH_KEYWORDS },
|
{ "wxObject_GetClassName", (PyCFunction) _wrap_wxObject_GetClassName, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxGetAccelFromString", (PyCFunction) _wrap_wxGetAccelFromString, METH_VARARGS | METH_KEYWORDS },
|
{ "wxGetAccelFromString", (PyCFunction) _wrap_wxGetAccelFromString, METH_VARARGS | METH_KEYWORDS },
|
||||||
|
{ "wxGetUserHome", (PyCFunction) _wrap_wxGetUserHome, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxGetHomeDir", (PyCFunction) _wrap_wxGetHomeDir, METH_VARARGS | METH_KEYWORDS },
|
{ "wxGetHomeDir", (PyCFunction) _wrap_wxGetHomeDir, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxGetUserName", (PyCFunction) _wrap_wxGetUserName, METH_VARARGS | METH_KEYWORDS },
|
{ "wxGetUserName", (PyCFunction) _wrap_wxGetUserName, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxGetUserId", (PyCFunction) _wrap_wxGetUserId, METH_VARARGS | METH_KEYWORDS },
|
{ "wxGetUserId", (PyCFunction) _wrap_wxGetUserId, METH_VARARGS | METH_KEYWORDS },
|
||||||
|
@@ -603,6 +603,8 @@ wxGetUserName = miscc.wxGetUserName
|
|||||||
|
|
||||||
wxGetHomeDir = miscc.wxGetHomeDir
|
wxGetHomeDir = miscc.wxGetHomeDir
|
||||||
|
|
||||||
|
wxGetUserHome = miscc.wxGetUserHome
|
||||||
|
|
||||||
def wxGetAccelFromString(*_args, **_kwargs):
|
def wxGetAccelFromString(*_args, **_kwargs):
|
||||||
val = apply(miscc.wxGetAccelFromString,_args,_kwargs)
|
val = apply(miscc.wxGetAccelFromString,_args,_kwargs)
|
||||||
if val: val = wxAcceleratorEntryPtr(val)
|
if val: val = wxAcceleratorEntryPtr(val)
|
||||||
|
@@ -10625,6 +10625,7 @@ SWIGEXPORT(void) initmisc2c() {
|
|||||||
PyDict_SetItemString(d,"wxSYS_DEFAULT_GUI_FONT", PyInt_FromLong((long) wxSYS_DEFAULT_GUI_FONT));
|
PyDict_SetItemString(d,"wxSYS_DEFAULT_GUI_FONT", PyInt_FromLong((long) wxSYS_DEFAULT_GUI_FONT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_SCROLLBAR", PyInt_FromLong((long) wxSYS_COLOUR_SCROLLBAR));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_SCROLLBAR", PyInt_FromLong((long) wxSYS_COLOUR_SCROLLBAR));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_BACKGROUND", PyInt_FromLong((long) wxSYS_COLOUR_BACKGROUND));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_BACKGROUND", PyInt_FromLong((long) wxSYS_COLOUR_BACKGROUND));
|
||||||
|
PyDict_SetItemString(d,"wxSYS_COLOUR_DESKTOP", PyInt_FromLong((long) wxSYS_COLOUR_DESKTOP));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_ACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_ACTIVECAPTION));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_ACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_ACTIVECAPTION));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTION));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTION));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_MENU", PyInt_FromLong((long) wxSYS_COLOUR_MENU));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_MENU", PyInt_FromLong((long) wxSYS_COLOUR_MENU));
|
||||||
@@ -10639,22 +10640,27 @@ SWIGEXPORT(void) initmisc2c() {
|
|||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHTTEXT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHTTEXT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_HIGHLIGHTTEXT", PyInt_FromLong((long) wxSYS_COLOUR_HIGHLIGHTTEXT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNFACE", PyInt_FromLong((long) wxSYS_COLOUR_BTNFACE));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNFACE", PyInt_FromLong((long) wxSYS_COLOUR_BTNFACE));
|
||||||
|
PyDict_SetItemString(d,"wxSYS_COLOUR_3DFACE", PyInt_FromLong((long) wxSYS_COLOUR_3DFACE));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_BTNSHADOW));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_BTNSHADOW));
|
||||||
|
PyDict_SetItemString(d,"wxSYS_COLOUR_3DSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DSHADOW));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_GRAYTEXT", PyInt_FromLong((long) wxSYS_COLOUR_GRAYTEXT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_GRAYTEXT", PyInt_FromLong((long) wxSYS_COLOUR_GRAYTEXT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNTEXT", PyInt_FromLong((long) wxSYS_COLOUR_BTNTEXT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNTEXT", PyInt_FromLong((long) wxSYS_COLOUR_BTNTEXT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTIONTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTIONTEXT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_INACTIVECAPTIONTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INACTIVECAPTIONTEXT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHIGHLIGHT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHIGHLIGHT));
|
||||||
|
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHILIGHT));
|
||||||
|
PyDict_SetItemString(d,"wxSYS_COLOUR_3DHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHIGHLIGHT));
|
||||||
|
PyDict_SetItemString(d,"wxSYS_COLOUR_3DHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHILIGHT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_3DDKSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DDKSHADOW));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_3DDKSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DDKSHADOW));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_3DLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DLIGHT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_3DLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DLIGHT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_INFOTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INFOTEXT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_INFOTEXT", PyInt_FromLong((long) wxSYS_COLOUR_INFOTEXT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_INFOBK", PyInt_FromLong((long) wxSYS_COLOUR_INFOBK));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_INFOBK", PyInt_FromLong((long) wxSYS_COLOUR_INFOBK));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_LISTBOX", PyInt_FromLong((long) wxSYS_COLOUR_LISTBOX));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_LISTBOX", PyInt_FromLong((long) wxSYS_COLOUR_LISTBOX));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_DESKTOP", PyInt_FromLong((long) wxSYS_COLOUR_DESKTOP));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_HOTLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_HOTLIGHT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_3DFACE", PyInt_FromLong((long) wxSYS_COLOUR_3DFACE));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_GRADIENTACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_GRADIENTACTIVECAPTION));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_3DSHADOW", PyInt_FromLong((long) wxSYS_COLOUR_3DSHADOW));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_GRADIENTINACTIVECAPTION", PyInt_FromLong((long) wxSYS_COLOUR_GRADIENTINACTIVECAPTION));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_3DHIGHLIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHIGHLIGHT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_MENUHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_MENUHILIGHT));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_3DHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_3DHILIGHT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_MENUBAR", PyInt_FromLong((long) wxSYS_COLOUR_MENUBAR));
|
||||||
PyDict_SetItemString(d,"wxSYS_COLOUR_BTNHILIGHT", PyInt_FromLong((long) wxSYS_COLOUR_BTNHILIGHT));
|
PyDict_SetItemString(d,"wxSYS_COLOUR_MAX", PyInt_FromLong((long) wxSYS_COLOUR_MAX));
|
||||||
PyDict_SetItemString(d,"wxSYS_MOUSE_BUTTONS", PyInt_FromLong((long) wxSYS_MOUSE_BUTTONS));
|
PyDict_SetItemString(d,"wxSYS_MOUSE_BUTTONS", PyInt_FromLong((long) wxSYS_MOUSE_BUTTONS));
|
||||||
PyDict_SetItemString(d,"wxSYS_BORDER_X", PyInt_FromLong((long) wxSYS_BORDER_X));
|
PyDict_SetItemString(d,"wxSYS_BORDER_X", PyInt_FromLong((long) wxSYS_BORDER_X));
|
||||||
PyDict_SetItemString(d,"wxSYS_BORDER_Y", PyInt_FromLong((long) wxSYS_BORDER_Y));
|
PyDict_SetItemString(d,"wxSYS_BORDER_Y", PyInt_FromLong((long) wxSYS_BORDER_Y));
|
||||||
|
@@ -1216,6 +1216,7 @@ wxSYS_SYSTEM_FIXED_FONT = misc2c.wxSYS_SYSTEM_FIXED_FONT
|
|||||||
wxSYS_DEFAULT_GUI_FONT = misc2c.wxSYS_DEFAULT_GUI_FONT
|
wxSYS_DEFAULT_GUI_FONT = misc2c.wxSYS_DEFAULT_GUI_FONT
|
||||||
wxSYS_COLOUR_SCROLLBAR = misc2c.wxSYS_COLOUR_SCROLLBAR
|
wxSYS_COLOUR_SCROLLBAR = misc2c.wxSYS_COLOUR_SCROLLBAR
|
||||||
wxSYS_COLOUR_BACKGROUND = misc2c.wxSYS_COLOUR_BACKGROUND
|
wxSYS_COLOUR_BACKGROUND = misc2c.wxSYS_COLOUR_BACKGROUND
|
||||||
|
wxSYS_COLOUR_DESKTOP = misc2c.wxSYS_COLOUR_DESKTOP
|
||||||
wxSYS_COLOUR_ACTIVECAPTION = misc2c.wxSYS_COLOUR_ACTIVECAPTION
|
wxSYS_COLOUR_ACTIVECAPTION = misc2c.wxSYS_COLOUR_ACTIVECAPTION
|
||||||
wxSYS_COLOUR_INACTIVECAPTION = misc2c.wxSYS_COLOUR_INACTIVECAPTION
|
wxSYS_COLOUR_INACTIVECAPTION = misc2c.wxSYS_COLOUR_INACTIVECAPTION
|
||||||
wxSYS_COLOUR_MENU = misc2c.wxSYS_COLOUR_MENU
|
wxSYS_COLOUR_MENU = misc2c.wxSYS_COLOUR_MENU
|
||||||
@@ -1230,22 +1231,27 @@ wxSYS_COLOUR_APPWORKSPACE = misc2c.wxSYS_COLOUR_APPWORKSPACE
|
|||||||
wxSYS_COLOUR_HIGHLIGHT = misc2c.wxSYS_COLOUR_HIGHLIGHT
|
wxSYS_COLOUR_HIGHLIGHT = misc2c.wxSYS_COLOUR_HIGHLIGHT
|
||||||
wxSYS_COLOUR_HIGHLIGHTTEXT = misc2c.wxSYS_COLOUR_HIGHLIGHTTEXT
|
wxSYS_COLOUR_HIGHLIGHTTEXT = misc2c.wxSYS_COLOUR_HIGHLIGHTTEXT
|
||||||
wxSYS_COLOUR_BTNFACE = misc2c.wxSYS_COLOUR_BTNFACE
|
wxSYS_COLOUR_BTNFACE = misc2c.wxSYS_COLOUR_BTNFACE
|
||||||
|
wxSYS_COLOUR_3DFACE = misc2c.wxSYS_COLOUR_3DFACE
|
||||||
wxSYS_COLOUR_BTNSHADOW = misc2c.wxSYS_COLOUR_BTNSHADOW
|
wxSYS_COLOUR_BTNSHADOW = misc2c.wxSYS_COLOUR_BTNSHADOW
|
||||||
|
wxSYS_COLOUR_3DSHADOW = misc2c.wxSYS_COLOUR_3DSHADOW
|
||||||
wxSYS_COLOUR_GRAYTEXT = misc2c.wxSYS_COLOUR_GRAYTEXT
|
wxSYS_COLOUR_GRAYTEXT = misc2c.wxSYS_COLOUR_GRAYTEXT
|
||||||
wxSYS_COLOUR_BTNTEXT = misc2c.wxSYS_COLOUR_BTNTEXT
|
wxSYS_COLOUR_BTNTEXT = misc2c.wxSYS_COLOUR_BTNTEXT
|
||||||
wxSYS_COLOUR_INACTIVECAPTIONTEXT = misc2c.wxSYS_COLOUR_INACTIVECAPTIONTEXT
|
wxSYS_COLOUR_INACTIVECAPTIONTEXT = misc2c.wxSYS_COLOUR_INACTIVECAPTIONTEXT
|
||||||
wxSYS_COLOUR_BTNHIGHLIGHT = misc2c.wxSYS_COLOUR_BTNHIGHLIGHT
|
wxSYS_COLOUR_BTNHIGHLIGHT = misc2c.wxSYS_COLOUR_BTNHIGHLIGHT
|
||||||
|
wxSYS_COLOUR_BTNHILIGHT = misc2c.wxSYS_COLOUR_BTNHILIGHT
|
||||||
|
wxSYS_COLOUR_3DHIGHLIGHT = misc2c.wxSYS_COLOUR_3DHIGHLIGHT
|
||||||
|
wxSYS_COLOUR_3DHILIGHT = misc2c.wxSYS_COLOUR_3DHILIGHT
|
||||||
wxSYS_COLOUR_3DDKSHADOW = misc2c.wxSYS_COLOUR_3DDKSHADOW
|
wxSYS_COLOUR_3DDKSHADOW = misc2c.wxSYS_COLOUR_3DDKSHADOW
|
||||||
wxSYS_COLOUR_3DLIGHT = misc2c.wxSYS_COLOUR_3DLIGHT
|
wxSYS_COLOUR_3DLIGHT = misc2c.wxSYS_COLOUR_3DLIGHT
|
||||||
wxSYS_COLOUR_INFOTEXT = misc2c.wxSYS_COLOUR_INFOTEXT
|
wxSYS_COLOUR_INFOTEXT = misc2c.wxSYS_COLOUR_INFOTEXT
|
||||||
wxSYS_COLOUR_INFOBK = misc2c.wxSYS_COLOUR_INFOBK
|
wxSYS_COLOUR_INFOBK = misc2c.wxSYS_COLOUR_INFOBK
|
||||||
wxSYS_COLOUR_LISTBOX = misc2c.wxSYS_COLOUR_LISTBOX
|
wxSYS_COLOUR_LISTBOX = misc2c.wxSYS_COLOUR_LISTBOX
|
||||||
wxSYS_COLOUR_DESKTOP = misc2c.wxSYS_COLOUR_DESKTOP
|
wxSYS_COLOUR_HOTLIGHT = misc2c.wxSYS_COLOUR_HOTLIGHT
|
||||||
wxSYS_COLOUR_3DFACE = misc2c.wxSYS_COLOUR_3DFACE
|
wxSYS_COLOUR_GRADIENTACTIVECAPTION = misc2c.wxSYS_COLOUR_GRADIENTACTIVECAPTION
|
||||||
wxSYS_COLOUR_3DSHADOW = misc2c.wxSYS_COLOUR_3DSHADOW
|
wxSYS_COLOUR_GRADIENTINACTIVECAPTION = misc2c.wxSYS_COLOUR_GRADIENTINACTIVECAPTION
|
||||||
wxSYS_COLOUR_3DHIGHLIGHT = misc2c.wxSYS_COLOUR_3DHIGHLIGHT
|
wxSYS_COLOUR_MENUHILIGHT = misc2c.wxSYS_COLOUR_MENUHILIGHT
|
||||||
wxSYS_COLOUR_3DHILIGHT = misc2c.wxSYS_COLOUR_3DHILIGHT
|
wxSYS_COLOUR_MENUBAR = misc2c.wxSYS_COLOUR_MENUBAR
|
||||||
wxSYS_COLOUR_BTNHILIGHT = misc2c.wxSYS_COLOUR_BTNHILIGHT
|
wxSYS_COLOUR_MAX = misc2c.wxSYS_COLOUR_MAX
|
||||||
wxSYS_MOUSE_BUTTONS = misc2c.wxSYS_MOUSE_BUTTONS
|
wxSYS_MOUSE_BUTTONS = misc2c.wxSYS_MOUSE_BUTTONS
|
||||||
wxSYS_BORDER_X = misc2c.wxSYS_BORDER_X
|
wxSYS_BORDER_X = misc2c.wxSYS_BORDER_X
|
||||||
wxSYS_BORDER_Y = misc2c.wxSYS_BORDER_Y
|
wxSYS_BORDER_Y = misc2c.wxSYS_BORDER_Y
|
||||||
|
@@ -3317,6 +3317,43 @@ static PyObject *_wrap_wxWindow_PushEventHandler(PyObject *self, PyObject *args,
|
|||||||
return _resultobj;
|
return _resultobj;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define wxWindow_RemoveEventHandler(_swigobj,_swigarg0) (_swigobj->RemoveEventHandler(_swigarg0))
|
||||||
|
static PyObject *_wrap_wxWindow_RemoveEventHandler(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
|
PyObject * _resultobj;
|
||||||
|
bool _result;
|
||||||
|
wxWindow * _arg0;
|
||||||
|
wxEvtHandler * _arg1;
|
||||||
|
PyObject * _argo0 = 0;
|
||||||
|
PyObject * _argo1 = 0;
|
||||||
|
char *_kwnames[] = { "self","handler", NULL };
|
||||||
|
|
||||||
|
self = self;
|
||||||
|
if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OO:wxWindow_RemoveEventHandler",_kwnames,&_argo0,&_argo1))
|
||||||
|
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_RemoveEventHandler. Expected _wxWindow_p.");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (_argo1) {
|
||||||
|
if (_argo1 == Py_None) { _arg1 = NULL; }
|
||||||
|
else if (SWIG_GetPtrObj(_argo1,(void **) &_arg1,"_wxEvtHandler_p")) {
|
||||||
|
PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_RemoveEventHandler. Expected _wxEvtHandler_p.");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
PyThreadState* __tstate = wxPyBeginAllowThreads();
|
||||||
|
_result = (bool )wxWindow_RemoveEventHandler(_arg0,_arg1);
|
||||||
|
|
||||||
|
wxPyEndAllowThreads(__tstate);
|
||||||
|
if (PyErr_Occurred()) return NULL;
|
||||||
|
} _resultobj = Py_BuildValue("i",_result);
|
||||||
|
return _resultobj;
|
||||||
|
}
|
||||||
|
|
||||||
#define wxWindow_PopupMenuXY(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
|
#define wxWindow_PopupMenuXY(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->PopupMenu(_swigarg0,_swigarg1,_swigarg2))
|
||||||
static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args, PyObject *kwargs) {
|
static PyObject *_wrap_wxWindow_PopupMenuXY(PyObject *self, PyObject *args, PyObject *kwargs) {
|
||||||
PyObject * _resultobj;
|
PyObject * _resultobj;
|
||||||
@@ -10675,6 +10712,7 @@ static PyMethodDef windowscMethods[] = {
|
|||||||
{ "wxWindow_Raise", (PyCFunction) _wrap_wxWindow_Raise, METH_VARARGS | METH_KEYWORDS },
|
{ "wxWindow_Raise", (PyCFunction) _wrap_wxWindow_Raise, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxWindow_PopupMenu", (PyCFunction) _wrap_wxWindow_PopupMenu, METH_VARARGS | METH_KEYWORDS },
|
{ "wxWindow_PopupMenu", (PyCFunction) _wrap_wxWindow_PopupMenu, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxWindow_PopupMenuXY", (PyCFunction) _wrap_wxWindow_PopupMenuXY, METH_VARARGS | METH_KEYWORDS },
|
{ "wxWindow_PopupMenuXY", (PyCFunction) _wrap_wxWindow_PopupMenuXY, METH_VARARGS | METH_KEYWORDS },
|
||||||
|
{ "wxWindow_RemoveEventHandler", (PyCFunction) _wrap_wxWindow_RemoveEventHandler, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxWindow_PushEventHandler", (PyCFunction) _wrap_wxWindow_PushEventHandler, METH_VARARGS | METH_KEYWORDS },
|
{ "wxWindow_PushEventHandler", (PyCFunction) _wrap_wxWindow_PushEventHandler, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxWindow_PopEventHandler", (PyCFunction) _wrap_wxWindow_PopEventHandler, METH_VARARGS | METH_KEYWORDS },
|
{ "wxWindow_PopEventHandler", (PyCFunction) _wrap_wxWindow_PopEventHandler, METH_VARARGS | METH_KEYWORDS },
|
||||||
{ "wxWindow_Move", (PyCFunction) _wrap_wxWindow_Move, METH_VARARGS | METH_KEYWORDS },
|
{ "wxWindow_Move", (PyCFunction) _wrap_wxWindow_Move, METH_VARARGS | METH_KEYWORDS },
|
||||||
|
@@ -331,6 +331,9 @@ class wxWindowPtr(wxEvtHandlerPtr):
|
|||||||
def PushEventHandler(self, *_args, **_kwargs):
|
def PushEventHandler(self, *_args, **_kwargs):
|
||||||
val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs)
|
val = apply(windowsc.wxWindow_PushEventHandler,(self,) + _args, _kwargs)
|
||||||
return val
|
return val
|
||||||
|
def RemoveEventHandler(self, *_args, **_kwargs):
|
||||||
|
val = apply(windowsc.wxWindow_RemoveEventHandler,(self,) + _args, _kwargs)
|
||||||
|
return val
|
||||||
def PopupMenuXY(self, *_args, **_kwargs):
|
def PopupMenuXY(self, *_args, **_kwargs):
|
||||||
val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs)
|
val = apply(windowsc.wxWindow_PopupMenuXY,(self,) + _args, _kwargs)
|
||||||
return val
|
return val
|
||||||
|
@@ -2198,8 +2198,6 @@ SWIGEXPORT(void) initwxc() {
|
|||||||
PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE));
|
PyDict_SetItemString(d,"wxNB_MULTILINE", PyInt_FromLong((long) wxNB_MULTILINE));
|
||||||
PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL));
|
PyDict_SetItemString(d,"wxLI_HORIZONTAL", PyInt_FromLong((long) wxLI_HORIZONTAL));
|
||||||
PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL));
|
PyDict_SetItemString(d,"wxLI_VERTICAL", PyInt_FromLong((long) wxLI_VERTICAL));
|
||||||
PyDict_SetItemString(d,"wxHW_SCROLLBAR_NEVER", PyInt_FromLong((long) wxHW_SCROLLBAR_NEVER));
|
|
||||||
PyDict_SetItemString(d,"wxHW_SCROLLBAR_AUTO", PyInt_FromLong((long) wxHW_SCROLLBAR_AUTO));
|
|
||||||
PyDict_SetItemString(d,"wxJOYSTICK1", PyInt_FromLong((long) wxJOYSTICK1));
|
PyDict_SetItemString(d,"wxJOYSTICK1", PyInt_FromLong((long) wxJOYSTICK1));
|
||||||
PyDict_SetItemString(d,"wxJOYSTICK2", PyInt_FromLong((long) wxJOYSTICK2));
|
PyDict_SetItemString(d,"wxJOYSTICK2", PyInt_FromLong((long) wxJOYSTICK2));
|
||||||
PyDict_SetItemString(d,"wxJOY_BUTTON1", PyInt_FromLong((long) wxJOY_BUTTON1));
|
PyDict_SetItemString(d,"wxJOY_BUTTON1", PyInt_FromLong((long) wxJOY_BUTTON1));
|
||||||
|
@@ -431,8 +431,6 @@ wxNB_BOTTOM = wxc.wxNB_BOTTOM
|
|||||||
wxNB_MULTILINE = wxc.wxNB_MULTILINE
|
wxNB_MULTILINE = wxc.wxNB_MULTILINE
|
||||||
wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL
|
wxLI_HORIZONTAL = wxc.wxLI_HORIZONTAL
|
||||||
wxLI_VERTICAL = wxc.wxLI_VERTICAL
|
wxLI_VERTICAL = wxc.wxLI_VERTICAL
|
||||||
wxHW_SCROLLBAR_NEVER = wxc.wxHW_SCROLLBAR_NEVER
|
|
||||||
wxHW_SCROLLBAR_AUTO = wxc.wxHW_SCROLLBAR_AUTO
|
|
||||||
wxJOYSTICK1 = wxc.wxJOYSTICK1
|
wxJOYSTICK1 = wxc.wxJOYSTICK1
|
||||||
wxJOYSTICK2 = wxc.wxJOYSTICK2
|
wxJOYSTICK2 = wxc.wxJOYSTICK2
|
||||||
wxJOY_BUTTON1 = wxc.wxJOY_BUTTON1
|
wxJOY_BUTTON1 = wxc.wxJOY_BUTTON1
|
||||||
|
@@ -283,6 +283,13 @@ public:
|
|||||||
wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
|
wxEvtHandler* PopEventHandler(bool deleteHandler = FALSE);
|
||||||
void PushEventHandler(wxEvtHandler* handler);
|
void PushEventHandler(wxEvtHandler* handler);
|
||||||
|
|
||||||
|
// find the given handler in the event handler chain and remove (but
|
||||||
|
// not delete) it from the event handler chain, return TRUE if it was
|
||||||
|
// found and FALSE otherwise (this also results in an assert failure so
|
||||||
|
// this function should only be called when the handler is supposed to
|
||||||
|
// be there)
|
||||||
|
bool RemoveEventHandler(wxEvtHandler *handler);
|
||||||
|
|
||||||
%name(PopupMenuXY)bool PopupMenu(wxMenu *menu, int x, int y);
|
%name(PopupMenuXY)bool PopupMenu(wxMenu *menu, int x, int y);
|
||||||
bool PopupMenu(wxMenu *menu, const wxPoint& pos);
|
bool PopupMenu(wxMenu *menu, const wxPoint& pos);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user